Bugfix: Fix NULL pointer dereference in workspaces which have preferred screens but...

diff --git a/src/xinerama.c b/src/xinerama.c
index 81359ec2ba76881421bebd89effc0d42a4040498..15e8b0a35c47298fd08a51e24de22fdec02e321b 100644 (file)
--- a/src/xinerama.c
+++ b/src/xinerama.c
@@ -425,7 +425,7 @@ void xinerama_requery_screens(xcb_connection_t *conn) {
         /* Check for workspaces which need to be assigned to specific screens
          * which may now be available */
         TAILQ_FOREACH(ws, workspaces, workspaces) {
-                if (ws->preferred_screen == NULL)
+                if (ws->preferred_screen == NULL || ws->screen == NULL)
                         continue;
 
                 workspace_initialize(ws, ws->screen, true);