X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;ds=sidebyside;f=openbox%2Fscreen.c;h=c7127214b599123c39d7611d200f5af45b1290b5;hb=1ee19207fbcf8c0918858d83d04b308ecd6988a7;hp=7c3cb8d01abdeed04889be315ad68dfb896d018d;hpb=f791f9a35e016b52295fa733dc21f9d64de6ead1;p=chaz%2Fopenbox diff --git a/openbox/screen.c b/openbox/screen.c index 7c3cb8d0..c7127214 100644 --- a/openbox/screen.c +++ b/openbox/screen.c @@ -455,7 +455,7 @@ void screen_set_desktop(guint num) } event_ignore_queued_enters(); - + focus_fallback(OB_FOCUS_FALLBACK_NOFOCUS); } @@ -864,15 +864,15 @@ void screen_install_colormap(ObClient *client, gboolean install) else XUninstallColormap(RrDisplay(ob_rr_inst), RrColormap(ob_rr_inst)); } else { - if (XGetWindowAttributes(ob_display, client->window, &wa) && + if (XGetWindowAttributes(ob_display, client->window, &wa) && wa.colormap != None) { xerror_set_ignore(TRUE); - if (install) - XInstallColormap(RrDisplay(ob_rr_inst), wa.colormap); - else - XUninstallColormap(RrDisplay(ob_rr_inst), wa.colormap); + if (install) + XInstallColormap(RrDisplay(ob_rr_inst), wa.colormap); + else + XUninstallColormap(RrDisplay(ob_rr_inst), wa.colormap); xerror_set_ignore(FALSE); - } + } } }