nixo
/
gri3-wm
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge pull request #3524 from orestisf1993/regress-randr 

randr.c: Fix regression with focusing NULL container
next
Ingo Bürk 2018-11-15 12:57:59 +01:00 committed by GitHub
parent 299e9b9fdd a84b30f8a9
commit 8ad84f06c9
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/randr.c
View File

@ -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;