summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLibravatar emersion <contact@emersion.fr>2018-07-19 08:24:34 +0100
committerLibravatar GitHub <noreply@github.com>2018-07-19 08:24:34 +0100
commitdfb45ded1ca1c5f7ffb986510199ebf2376068b1 (patch)
treee3e72055d8df33245d15cd73366b82b8a4681b28
parentMerge pull request #2300 from emersion/override-redirect-updates (diff)
parentFix crash when moving workspace to output (diff)
downloadsway-dfb45ded1ca1c5f7ffb986510199ebf2376068b1.tar.gz
sway-dfb45ded1ca1c5f7ffb986510199ebf2376068b1.tar.zst
sway-dfb45ded1ca1c5f7ffb986510199ebf2376068b1.zip
Merge pull request #2306 from RyanDwyer/move-workspace-crash
Fix crash when moving workspace to output
-rw-r--r--sway/tree/layout.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/sway/tree/layout.c b/sway/tree/layout.c
index 197a2fc8..1f898f8a 100644
--- a/sway/tree/layout.c
+++ b/sway/tree/layout.c
@@ -232,7 +232,9 @@ void container_move_to(struct sway_container *container,
232 } 232 }
233 if (new_workspace != old_workspace) { 233 if (new_workspace != old_workspace) {
234 workspace_detect_urgent(new_workspace); 234 workspace_detect_urgent(new_workspace);
235 workspace_detect_urgent(old_workspace); 235 if (old_workspace) {
236 workspace_detect_urgent(old_workspace);
237 }
236 } 238 }
237} 239}
238 240