diff options
author | Reinhard Tartler <siretart@tauware.de> | 2011-10-10 17:58:56 +0200 |
---|---|---|
committer | Reinhard Tartler <siretart@tauware.de> | 2011-10-10 17:58:56 +0200 |
commit | 22914447019845ba3ba238e5814b59939e744f19 (patch) | |
tree | 3fc9f4d98f3e04e61820f65cfd5b4091a5befd8e /nx-X11/programs/Xserver/hw/nxagent/Colormap.c | |
parent | fc05e5e04843762820effb5b5bb145536ddd41f0 (diff) | |
download | nx-libs-22914447019845ba3ba238e5814b59939e744f19.tar.gz nx-libs-22914447019845ba3ba238e5814b59939e744f19.tar.bz2 nx-libs-22914447019845ba3ba238e5814b59939e744f19.zip |
Imported nxagent-3.3.0-18.tar.gznxagent/3.3.0-18
Summary: Imported nxagent-3.3.0-18.tar.gz
Keywords:
Imported nxagent-3.3.0-18.tar.gz
into Git repository
Diffstat (limited to 'nx-X11/programs/Xserver/hw/nxagent/Colormap.c')
-rw-r--r-- | nx-X11/programs/Xserver/hw/nxagent/Colormap.c | 17 |
1 files changed, 14 insertions, 3 deletions
diff --git a/nx-X11/programs/Xserver/hw/nxagent/Colormap.c b/nx-X11/programs/Xserver/hw/nxagent/Colormap.c index 75758679f..fe0e567f6 100644 --- a/nx-X11/programs/Xserver/hw/nxagent/Colormap.c +++ b/nx-X11/programs/Xserver/hw/nxagent/Colormap.c @@ -291,9 +291,20 @@ void nxagentSetInstalledColormapWindows(ScreenPtr pScreen) pCmap = (ColormapPtr)LookupIDByType(pScreen->defColormap, RT_COLORMAP); - XSetWindowColormap(nxagentDisplay, - nxagentDefaultWindows[pScreen->myNum], - nxagentColormap(pCmap)); + if (pCmap != NULL) + { + XSetWindowColormap(nxagentDisplay, + nxagentDefaultWindows[pScreen->myNum], + nxagentColormap(pCmap)); + } + #ifdef WARNING + else + { + fprintf(stderr, "nxagentSetInstalledColormapWindows: WARNING! " + "Window at [%p] has no colormap with class [%d].\n", + pWin, pWin -> drawable.class); + } + #endif } #endif /* DUMB_WINDOW_MANAGERS */ } |