From: Michael Stapelberg <michael@stapelberg.de>
Date: Sun, 6 Mar 2011 21:02:02 +0000 (+0100)
Subject: Bugfix: Fix crash with transient dock clients caused by 7154fecbb
X-Git-Tag: tree-pr2~3
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=8ce5f2a21bfc2194a0cca1da223778bcb29872af;p=i3%2Fi3

Bugfix: Fix crash with transient dock clients caused by 7154fecbb
---

diff --git a/src/manage.c b/src/manage.c
index 53526f6a..192bcbf3 100644
--- a/src/manage.c
+++ b/src/manage.c
@@ -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);
             }