all repos — openbox @ a59540f25aed8551262a89b6426b201546a8418c

openbox fork - make it a bit more like ryudo 

improve the colormap setting code
Dana Jansens danakj@orodu.net
commit

a59540f25aed8551262a89b6426b201546a8418c

parent

35889c2854b55c14a41c854271249fa813e81cf1

1 files changed, 4 insertions(+), 5 deletions(-)

jump to
M openbox/screen.c → openbox/screen.c 
@@ -1026,17 +1026,16 @@ }
 
 void screen_install_colormap(ObClient *client, gboolean install)
 {
-    if (client == NULL) {
+    if (client == NULL || client->colormap == None) {
         if (install)
             XInstallColormap(RrDisplay(ob_rr_inst), RrColormap(ob_rr_inst));
         else
             XUninstallColormap(RrDisplay(ob_rr_inst), RrColormap(ob_rr_inst));
     } else {
         xerror_set_ignore(TRUE);
-        if (install) {
-            if (client->colormap != None)
-                XInstallColormap(RrDisplay(ob_rr_inst), client->colormap);
-        } else
+        if (install)
+            XInstallColormap(RrDisplay(ob_rr_inst), client->colormap);
+        else
             XUninstallColormap(RrDisplay(ob_rr_inst), client->colormap);
         xerror_set_ignore(FALSE);
     }