aboutsummaryrefslogtreecommitdiff
path: root/nx-X11/programs/Xserver/hw/nxagent
diff options
context:
space:
mode:
Diffstat (limited to 'nx-X11/programs/Xserver/hw/nxagent')
-rw-r--r--nx-X11/programs/Xserver/hw/nxagent/Display.c14
1 files changed, 9 insertions, 5 deletions
diff --git a/nx-X11/programs/Xserver/hw/nxagent/Display.c b/nx-X11/programs/Xserver/hw/nxagent/Display.c
index 382cdf3c1..1cd3c25d9 100644
--- a/nx-X11/programs/Xserver/hw/nxagent/Display.c
+++ b/nx-X11/programs/Xserver/hw/nxagent/Display.c
@@ -1347,6 +1347,7 @@ FIXME: Use of nxagentParentWindow is strongly deprecated.
nxagentInitDepths();
nxagentInitPixmapFormats();
+ (void) nxagentCheckForPixmapFormatsCompatibility();
/*
* Create a pixmap for each depth matching the
@@ -1727,8 +1728,6 @@ XXX: Some X server doesn't list 1 among available depths...
}
}
#endif
-
- nxagentCheckForPixmapFormatsCompatibility();
}
void nxagentSetDefaultDrawables()
@@ -2838,11 +2837,16 @@ Bool nxagentReconnectDisplay(void *p0)
* formats are supported.
*/
- /*
- * FIXME: add an actual check here (and pass check value through nxagentInitPixmapFormats().)
- */
nxagentInitPixmapFormats();
+ if (nxagentCheckForPixmapFormatsCompatibility() == 0)
+ {
+ nxagentSetReconnectError(FAILED_RESUME_PIXMAPS_ALERT,
+ "Couldn't restore all the required pixmap formats.");
+
+ return False;
+ }
+
reconnectDisplayState = GOT_PIXMAP_FORMAT_LIST;
/*