From 470e0bd4d998e9c84e6f58736c7eb510c6223efd Mon Sep 17 00:00:00 2001
From: Ulrich Sibiller <uli42@gmx.de>
Date: Sun, 11 Aug 2019 01:47:16 +0200
Subject: 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.
---
 nx-X11/programs/Xserver/hw/nxagent/NXwindow.c |  5 ++++-
 nx-X11/programs/Xserver/hw/nxagent/Splash.c   | 15 ++++++---------
 nx-X11/programs/Xserver/hw/nxagent/Window.c   | 17 ++++++++++-------
 3 files changed, 20 insertions(+), 17 deletions(-)

(limited to 'nx-X11')

diff --git a/nx-X11/programs/Xserver/hw/nxagent/NXwindow.c b/nx-X11/programs/Xserver/hw/nxagent/NXwindow.c
index f67295c43..3cd8d0ce9 100644
--- a/nx-X11/programs/Xserver/hw/nxagent/NXwindow.c
+++ b/nx-X11/programs/Xserver/hw/nxagent/NXwindow.c
@@ -138,11 +138,14 @@ extern void nxagentSetVersionProperty(WindowPtr pWin);
 
 void nxagentClearSplash(WindowPtr pW)
 {
+    if (!pW)
+        return;
+
     ScreenPtr pScreen = pW->drawable.pScreen;
 
     if (pW->backgroundState == BackgroundPixmap)
     {
-      (*pScreen->DestroyPixmap)(pW->background.pixmap);
+        (*pScreen->DestroyPixmap)(pW->background.pixmap);
     }
 
     pW->backgroundState = BackgroundPixel;
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
diff --git a/nx-X11/programs/Xserver/hw/nxagent/Window.c b/nx-X11/programs/Xserver/hw/nxagent/Window.c
index 1095d0797..c666f9ad4 100644
--- a/nx-X11/programs/Xserver/hw/nxagent/Window.c
+++ b/nx-X11/programs/Xserver/hw/nxagent/Window.c
@@ -669,15 +669,18 @@ Bool nxagentDestroyWindow(WindowPtr pWin)
               nxagentSplashCount);
   #endif
 
-  if (nxagentSplashCount == 1)
+  if (nxagentRootTileWindow)
   {
-    XClearWindow(nxagentDisplay, nxagentWindowPriv(nxagentRootTileWindow) -> window);
-  }
+    if (nxagentSplashCount == 1)
+    {
+      XClearWindow(nxagentDisplay, nxagentWindowPriv(nxagentRootTileWindow) -> window);
+    }
 
-  if (pWin == nxagentRootTileWindow)
-  {
-    nxagentWindowPriv(nxagentRootTileWindow)->window = None;
-    nxagentRootTileWindow = None;
+    if (pWin == nxagentRootTileWindow)
+    {
+      nxagentWindowPriv(nxagentRootTileWindow)->window = None;
+      nxagentRootTileWindow = None;
+    }
   }
 
   pWindowPriv->window = None;
-- 
cgit v1.2.3