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/NXwindow.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/NXwindow.c')
| -rw-r--r-- | nx-X11/programs/Xserver/hw/nxagent/NXwindow.c | 5 |
1 files changed, 4 insertions, 1 deletions
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; |