summaryrefslogtreecommitdiffstats
path: root/xrdp
diff options
context:
space:
mode:
authorKoichiro IWAO <meta@vmeta.jp>2017-08-17 15:31:23 +0900
committermetalefty <meta@vmeta.jp>2017-09-05 17:17:33 +0900
commite6b7d12191200fec68fed07f61c54e44bc69d4f5 (patch)
tree43f9d9c31e3e6754658aa46a882f7231c1abc82e /xrdp
parent9ca52b05da1573e4aeea69cfd3d38bba179009ce (diff)
downloadxrdp-proprietary-e6b7d12191200fec68fed07f61c54e44bc69d4f5.tar.gz
xrdp-proprietary-e6b7d12191200fec68fed07f61c54e44bc69d4f5.zip
xrdp: accept full path for ls_background_image
because ls_logo_filename accepts full path.
Diffstat (limited to 'xrdp')
-rw-r--r--xrdp/xrdp_login_wnd.c10
1 files changed, 9 insertions, 1 deletions
diff --git a/xrdp/xrdp_login_wnd.c b/xrdp/xrdp_login_wnd.c
index a1e2380b..262f1bbb 100644
--- a/xrdp/xrdp_login_wnd.c
+++ b/xrdp/xrdp_login_wnd.c
@@ -729,7 +729,15 @@ xrdp_login_wnd_create(struct xrdp_wm *self)
{
char fileName[256] ;
but = xrdp_bitmap_create(4, 4, self->screen->bpp, WND_TYPE_IMAGE, self);
- g_snprintf(fileName, 255, "%s/%s", XRDP_SHARE_PATH, globals->ls_background_image);
+ if (globals->ls_background_image[0] == '/')
+ {
+ g_snprintf(fileName, 255, "%s", globals->ls_background_image);
+ }
+ else
+ {
+ g_snprintf(fileName, 255, "%s/%s",
+ XRDP_SHARE_PATH, globals->ls_background_image);
+ }
log_message(LOG_LEVEL_DEBUG, "We try to load the following background file: %s", fileName);
xrdp_bitmap_load(but, fileName, self->palette);
but->parent = self->screen;