summaryrefslogtreecommitdiff
path: root/openbox/screen.c
diff options
context:
space:
mode:
authorDana Jansens <danakj@orodu.net>2003-03-21 09:54:54 +0000
committerDana Jansens <danakj@orodu.net>2003-03-21 09:54:54 +0000
commit0cb6f81276a7e60c322990dfa1027136ef8c9633 (patch)
treebba1bf7a2a03b70c48d70ef86e674556f75d2510 /openbox/screen.c
parentc2cbef62bb5d7e0c3f8c00e95bc885dc1f9ab1da (diff)
dont use the client's colormap if it is set to None!
Diffstat (limited to 'openbox/screen.c')
-rw-r--r--openbox/screen.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/openbox/screen.c b/openbox/screen.c
index 2e6ff3f1..073b565f 100644
--- a/openbox/screen.c
+++ b/openbox/screen.c
@@ -430,7 +430,8 @@ void screen_install_colormap(Client *client, gboolean install)
XUninstallColormap(ob_display, render_colormap);
} else {
XWindowAttributes wa;
- if (XGetWindowAttributes(ob_display, client->window, &wa)) {
+ if (XGetWindowAttributes(ob_display, client->window, &wa) &&
+ wa.colormap != None) {
if (install)
XInstallColormap(ob_display, wa.colormap);
else