summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLibravatar Ryan Dwyer <ryandwyer1@gmail.com>2018-08-31 19:49:12 +1000
committerLibravatar Ryan Dwyer <ryandwyer1@gmail.com>2018-08-31 19:49:12 +1000
commit1e0459f7f7a6a266f7c65ba638db3fe3f4a53635 (patch)
treed99f609fe91396d00053eabb42e908f7bc7a95d0
parentMerge pull request #2537 from ianyfan/commands (diff)
downloadsway-1e0459f7f7a6a266f7c65ba638db3fe3f4a53635.tar.gz
sway-1e0459f7f7a6a266f7c65ba638db3fe3f4a53635.tar.zst
sway-1e0459f7f7a6a266f7c65ba638db3fe3f4a53635.zip
Fix crash when running deferred commands
Fixes #2541
-rw-r--r--sway/input/seat.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/sway/input/seat.c b/sway/input/seat.c
index 36e1d232..6a6e3096 100644
--- a/sway/input/seat.c
+++ b/sway/input/seat.c
@@ -635,7 +635,7 @@ void seat_set_focus_warp(struct sway_seat *seat,
635 635
636 // find new output's old workspace, which might have to be removed if empty 636 // find new output's old workspace, which might have to be removed if empty
637 struct sway_container *new_output_last_ws = NULL; 637 struct sway_container *new_output_last_ws = NULL;
638 if (last_output != new_output) { 638 if (new_output && last_output != new_output) {
639 new_output_last_ws = seat_get_active_child(seat, new_output); 639 new_output_last_ws = seat_get_active_child(seat, new_output);
640 } 640 }
641 641