mirrors/sway
1
0
Fork 0
mirror of https://github.com/swaywm/sway.git synced 2024-09-30 22:52:54 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1412 from Hummer12007/rcfix

Browse source 
handlers: preserve parent pointer value
This commit is contained in:
Drew DeVault 2017-10-17 16:56:06 -04:00 committed by GitHub
parent a996ee485d 22906f7fce
commit 4ded091491
1 changed files with 7 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
sway/handlers.c
View file

@ -552,7 +552,7 @@ static void handle_view_destroyed(wlc_handle handle) {
if (view) { if (view) {
bool fullscreen = swayc_is_fullscreen(view); bool fullscreen = swayc_is_fullscreen(view);
remove_view_from_scratchpad(view); remove_view_from_scratchpad(view);
swayc_t *parent = destroy_view(view); swayc_t *parent = destroy_view(view), *iter = NULL;
if (parent) { if (parent) {
ipc_event_window(parent, "close"); ipc_event_window(parent, "close");
@ -566,17 +566,18 @@ static void handle_view_destroyed(wlc_handle handle) {
} }
if (fullscreen) { if (fullscreen) {
while (parent) { iter = parent;
if (parent->fullscreen) { while (iter) {
parent->fullscreen = NULL; if (iter->fullscreen) {
iter->fullscreen = NULL;
break; break;
} }
parent = parent->parent; iter = iter->parent;
} }
} }
arrange_windows(parent, -1, -1); arrange_windows(iter ? iter : parent, -1, -1);
} }
} else { } else {
// Is it unmanaged? // Is it unmanaged?