aboutsummaryrefslogtreecommitdiff
path: root/nx-X11/programs/Xserver/hw/nxagent/Splash.c
diff options
context:
space:
mode:
authorUlrich Sibiller <uli42@gmx.de>2019-08-16 13:02:01 +0200
committerMike Gabriel <mike.gabriel@das-netzwerkteam.de>2019-08-27 08:12:39 +0200
commitab80152370da820cb42f22a500c1342bbb3ca3c8 (patch)
tree13fd2a89846815ba656afc7dc6e11871b7269be2 /nx-X11/programs/Xserver/hw/nxagent/Splash.c
parentb04b58badd9007cc92cb9fc68ecb85c3e3388e25 (diff)
downloadnx-libs-ab80152370da820cb42f22a500c1342bbb3ca3c8.tar.gz
nx-libs-ab80152370da820cb42f22a500c1342bbb3ca3c8.tar.bz2
nx-libs-ab80152370da820cb42f22a500c1342bbb3ca3c8.zip
nxagent: move nxagentWMPassed to Splash.c
It is only relevant there.
Diffstat (limited to 'nx-X11/programs/Xserver/hw/nxagent/Splash.c')
-rw-r--r--nx-X11/programs/Xserver/hw/nxagent/Splash.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/nx-X11/programs/Xserver/hw/nxagent/Splash.c b/nx-X11/programs/Xserver/hw/nxagent/Splash.c
index 6fa092a7d..8f3bc1ede 100644
--- a/nx-X11/programs/Xserver/hw/nxagent/Splash.c
+++ b/nx-X11/programs/Xserver/hw/nxagent/Splash.c
@@ -65,6 +65,7 @@
Pixmap nxagentPixmapLogo;
Window nxagentSplashWindow = None;
+Bool nxagentWMPassed = False;
static void nxagentPaintLogo(Window win, GC gc, int scale, int width, int height);
@@ -396,6 +397,9 @@ void nxagentPaintLogo(Window win, GC gc, int scale, int width, int height)
void nxagentRemoveSplashWindow(void)
{
+ if (nxagentWMPassed)
+ return;
+
if (nxagentReconnectTrap)
return;