summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/window.c5
1 files changed, 4 insertions, 1 deletions
diff --git a/src/window.c b/src/window.c
index 5410ba6..2620372 100644
--- a/src/window.c
+++ b/src/window.c
@@ -464,7 +464,10 @@ static void vwm_win_assimilate(vwm_t *vwm, vwm_window_t *vwin)
/* FIXME TODO: there's some situation where we get here but focused_desktop->focused_window == NULL,
* which shouldn't be possible; for there to be a non-empty screen, the focused_desktop must have a focused_window.
*/
- scr = vwm_screen_find(vwm, VWM_SCREEN_REL_XWIN, vwm->focused_desktop->focused_window->xwindow);
+ if (vwm->focused_desktop->focused_window)
+ scr = vwm_screen_find(vwm, VWM_SCREEN_REL_XWIN, vwm->focused_desktop->focused_window->xwindow);
+ else
+ VWM_BUG("Screen is not empty, but vwm->focused_desktop->focused_window is NULL!");
}
changes.x = scr->x_org;
© All Rights Reserved