aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDrew DeVault <sir@cmpwn.com>2018-09-01 13:00:26 -0400
committerGitHub <noreply@github.com>2018-09-01 13:00:26 -0400
commit80270ba086ae3c46ca66f794c5a2111ad1efa1bb (patch)
tree50608c90a49e59ff9b1ba08c24799d40790482c6
parent89a045835f284e368f36ea5b508f70a41f65d6be (diff)
parent1e0459f7f7a6a266f7c65ba638db3fe3f4a53635 (diff)
Merge pull request #2544 from RyanDwyer/fix-deferred-cmd-crash
Fix crash when running deferred commands
-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 5af9e88a..4b7c7893 100644
--- a/sway/input/seat.c
+++ b/sway/input/seat.c
@@ -635,7 +635,7 @@ void seat_set_focus_warp(struct sway_seat *seat,
// find new output's old workspace, which might have to be removed if empty
struct sway_container *new_output_last_ws = NULL;
- if (last_output != new_output) {
+ if (new_output && last_output != new_output) {
new_output_last_ws = seat_get_active_child(seat, new_output);
}