From: Dana Jansens <danakj@orodu.net>
Date: Fri, 21 Mar 2003 09:54:54 +0000 (+0000)
Subject: dont use the client's colormap if it is set to None!
X-Git-Url: https://git.dogcows.com/gitweb?a=commitdiff_plain;h=0cb6f81276a7e60c322990dfa1027136ef8c9633;p=chaz%2Fopenbox

dont use the client's colormap if it is set to None!
---

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