aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDrew DeVault <sir@cmpwn.com>2017-10-16 21:07:55 -0400
committerDrew DeVault <sir@cmpwn.com>2017-10-16 21:08:16 -0400
commitbfe8649e90eb88a52a31cf83bc2750895fddf3f9 (patch)
treeee4cf0bf9ec9436a134c6e33ef65ff1c9912c39a
parentbfb5e0cdff9c4ebda909554f30b51d6cf887effc (diff)
downloadsway-bfe8649e90eb88a52a31cf83bc2750895fddf3f9.zip
sway-bfe8649e90eb88a52a31cf83bc2750895fddf3f9.tar.gz
sway-bfe8649e90eb88a52a31cf83bc2750895fddf3f9.tar.bz2
Fix crash closing fullscreen windows in container0.15-rc2
-rw-r--r--sway/handlers.c15
1 files changed, 11 insertions, 4 deletions
diff --git a/sway/handlers.c b/sway/handlers.c
index d37142a..6ccf2b1 100644
--- a/sway/handlers.c
+++ b/sway/handlers.c
@@ -554,10 +554,6 @@ static void handle_view_destroyed(wlc_handle handle) {
remove_view_from_scratchpad(view);
swayc_t *parent = destroy_view(view);
if (parent) {
- if (fullscreen) {
- parent->fullscreen = NULL;
- }
-
ipc_event_window(parent, "close");
// Destroy empty workspaces
@@ -569,6 +565,17 @@ static void handle_view_destroyed(wlc_handle handle) {
parent = destroy_workspace(parent);
}
+ if (fullscreen) {
+ while (parent) {
+ if (parent->fullscreen) {
+ parent->fullscreen = NULL;
+ break;
+ }
+ parent = parent->parent;
+ }
+ }
+
+
arrange_windows(parent, -1, -1);
}
} else {