diff options
author | Drew DeVault <sir@cmpwn.com> | 2018-08-28 21:00:56 -0400 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-08-28 21:00:56 -0400 |
commit | ed775103c8bc68db8423eeac179492aeb6bcdedb (patch) | |
tree | ec7d3d7d41cc2cae0b173d64d5a2a30eddb450b9 | |
parent | Merge pull request #2533 from RyanDwyer/fix-workspace-tabs (diff) | |
parent | Fix crash when reaping a workspace (diff) | |
download | sway-ed775103c8bc68db8423eeac179492aeb6bcdedb.tar.gz sway-ed775103c8bc68db8423eeac179492aeb6bcdedb.tar.zst sway-ed775103c8bc68db8423eeac179492aeb6bcdedb.zip |
Merge pull request #2535 from RyanDwyer/fix-reap-crash
Fix crash when reaping a workspace
-rw-r--r-- | sway/tree/container.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/sway/tree/container.c b/sway/tree/container.c index ee019098..520b4566 100644 --- a/sway/tree/container.c +++ b/sway/tree/container.c | |||
@@ -173,6 +173,9 @@ struct sway_container *container_reap_empty(struct sway_container *con) { | |||
173 | } | 173 | } |
174 | if (con && con->type == C_WORKSPACE) { | 174 | if (con && con->type == C_WORKSPACE) { |
175 | workspace_consider_destroy(con); | 175 | workspace_consider_destroy(con); |
176 | if (con->destroying) { | ||
177 | con = con->parent; | ||
178 | } | ||
176 | } | 179 | } |
177 | return con; | 180 | return con; |
178 | } | 181 | } |