Merge pull request #3524 from orestisf1993/regress-randr

randr.c: Fix regression with focusing NULL container
tdemin · Nov 15, 2018 · 8ad84f0 · 8ad84f0
2 parents 299e9b9 + a84b30f
commit 8ad84f0
Showing 1 changed file with 6 additions and 4 deletions.
diff --git a/src/randr.c b/src/randr.c
@@ -974,10 +974,12 @@ void randr_disable_output(Output *output) {
             }
         }
 
-        /* Restore focus after con_detach / con_attach */
-        DLOG("now focusing next = %p\n", next);
-        con_focus(next);
-        workspace_show(con_get_workspace(next));
+        /* Restore focus after con_detach / con_attach. next can be NULL, see #3523. */
+        if (next) {
+            DLOG("now focusing next = %p\n", next);
+            con_focus(next);
+            workspace_show(con_get_workspace(next));
+        }
 
         /* 3: move the dock clients to the first output */
         Con *child;