4 files changed, 8 insertions, 13 deletions
diff --git a/nx-X11/programs/Xserver/hw/nxagent/NXdispatch.c b/nx-X11/programs/Xserver/hw/nxagent/NXdispatch.c
index c49cae51e..0ad26b0bb 100644
--- a/nx-X11/programs/Xserver/hw/nxagent/NXdispatch.c
+++ b/nx-X11/programs/Xserver/hw/nxagent/NXdispatch.c
@@ -144,7 +144,6 @@ void nxagentListRemoteFonts(const char *, int);
 #ifdef NXAGENT_ONSTART
 unsigned int nxagentWMtimeout = 0;
 #endif
-Bool         nxagentWMPassed  = False;
 
 /*
  * Timeouts based on screen saver time.
@@ -380,9 +379,9 @@ Reply   Total	Cached	Bits In			Bits Out		Bits/Reply	  Ratio
          * that the agent is ready.
          */
 
-        if (!nxagentWMPassed && (nxagentWMtimeout < currentDispatch))
+        if (nxagentWMtimeout < currentDispatch)
         {
-          nxagentRemoveSplashWindow();
+	   nxagentRemoveSplashWindow();
         }
 
         nxagentClients = nClients;
@@ -590,10 +589,7 @@ ProcReparentWindow(register ClientPtr client)
     if (!pWin)
         return(BadWindow);
 
-    if (!nxagentWMPassed)
-    {
-      nxagentRemoveSplashWindow();
-    }
+    nxagentRemoveSplashWindow();
 
     pParent = (WindowPtr)SecurityLookupWindow(stuff->parent, client,
 					      DixWriteAccess);
diff --git a/nx-X11/programs/Xserver/hw/nxagent/Screen.c b/nx-X11/programs/Xserver/hw/nxagent/Screen.c
index b089ef303..93110f782 100644
--- a/nx-X11/programs/Xserver/hw/nxagent/Screen.c
+++ b/nx-X11/programs/Xserver/hw/nxagent/Screen.c
@@ -3118,10 +3118,7 @@ int nxagentShadowPoll(PixmapPtr nxagentShadowPixmapPtr, GCPtr nxagentShadowGCPtr
 
   if (result == 1)
   {
-    if (!nxagentWMPassed)
-    {
-      nxagentRemoveSplashWindow();
-    }
+    nxagentRemoveSplashWindow();
 
     NXShadowExportChanges(&numRects, &ptBox);
     pBox = (BoxRec *)ptBox;
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;
 
diff --git a/nx-X11/programs/Xserver/hw/nxagent/Splash.h b/nx-X11/programs/Xserver/hw/nxagent/Splash.h
index 5f7547e57..a43801469 100644
--- a/nx-X11/programs/Xserver/hw/nxagent/Splash.h
+++ b/nx-X11/programs/Xserver/hw/nxagent/Splash.h
@@ -39,8 +39,6 @@ extern int nxagentXdmcpUp;
 
 extern Window nxagentSplashWindow;
 
-extern int nxagentWMPassed;
-
 extern void nxagentShowSplashWindow(Window);
 extern void nxagentRemoveSplashWindow();