diff options
| author | Ulrich Sibiller <uli42@gmx.de> | 2019-08-11 01:47:16 +0200 |
|---|---|---|
| committer | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2019-08-27 08:12:24 +0200 |
| commit | 470e0bd4d998e9c84e6f58736c7eb510c6223efd (patch) | |
| tree | fee39adfd3d30814e08a5879b9c4dd31fbb81c03 /nx-X11/programs/Xserver/hw/nxagent/Splash.c | |
| parent | a539aaa6aaa7a29023ef4c3d116fc2e1a11c82c1 (diff) | |
| download | nx-libs-470e0bd4d998e9c84e6f58736c7eb510c6223efd.tar.gz nx-libs-470e0bd4d998e9c84e6f58736c7eb510c6223efd.tar.bz2 nx-libs-470e0bd4d998e9c84e6f58736c7eb510c6223efd.zip | |
Splash.c: do not wait in nxagent mode
The splash window is only shown in x2go mode. In nxagent mode the
splash window was also shown, but empty (and thus invisible). And the
code waited for the splash window to disappear. Fix this by skipping
_all_ the splash stuff in nxagent mode.
Diffstat (limited to 'nx-X11/programs/Xserver/hw/nxagent/Splash.c')
| -rw-r--r-- | nx-X11/programs/Xserver/hw/nxagent/Splash.c | 15 |
1 files changed, 6 insertions, 9 deletions
diff --git a/nx-X11/programs/Xserver/hw/nxagent/Splash.c b/nx-X11/programs/Xserver/hw/nxagent/Splash.c index bc86fed36..e2e88674b 100644 --- a/nx-X11/programs/Xserver/hw/nxagent/Splash.c +++ b/nx-X11/programs/Xserver/hw/nxagent/Splash.c @@ -85,6 +85,12 @@ int nxagentShowSplashWindow(Window parentWindow) XSetWindowAttributes attributes; GC gc; + /* + * Show splash window only when running as X2Go Agent + */ + if(!nxagentX2go) + return False; + #ifdef TEST fprintf(stderr, "nxagentShowSplashWindow: Got called.\n"); #endif @@ -175,15 +181,6 @@ void nxagentPaintLogo(Window win, GC gc, int scale, int width, int height) XPoint rect[4]; int w, h, c, w2, h2; - /* - * Show only X2GO Logo when running as X2Go Agent - */ - if(! nxagentX2go) - { - nxagentPixmapLogo = 0L; - return; - } - #ifdef DEBUG fprintf(stderr, "nxagentPaintLogo: Got called.\n"); #endif |