]> git.sur5r.net Git - i3/i3/commitdiff
Bugfix: Fix crash with transient dock clients caused by 7154fecbb
authorMichael Stapelberg <michael@stapelberg.de>
Sun, 6 Mar 2011 21:02:02 +0000 (22:02 +0100)
committerMichael Stapelberg <michael@stapelberg.de>
Sun, 6 Mar 2011 21:02:02 +0000 (22:02 +0100)
src/manage.c

index 53526f6a9083433304efbcc5165a9cfaac8fe23c..192bcbf3a821438c28037b997c52dcfbb3db612a 100644 (file)
@@ -252,9 +252,9 @@ void manage_window(xcb_window_t window, xcb_get_window_attributes_cookie_t cooki
         want_floating = true;
 
         if (config.popup_during_fullscreen == PDF_LEAVE_FULLSCREEN) {
-            Con *ws = con_get_workspace(nc);
-            Con *fs = con_get_fullscreen_con(ws);
-            if (fs != NULL) {
+            Con *ws, *fs;
+            if ((ws = con_get_workspace(nc)) &&
+                (fs = con_get_fullscreen_con(ws))) {
                 LOG("There is a fullscreen window, leaving fullscreen mode\n");
                 con_toggle_fullscreen(fs);
             }