diff options
| author |  Drew DeVault <sir@cmpwn.com> | 2018-09-01 13:00:26 -0400 |
|---|---|---|
| committer |  GitHub <noreply@github.com> | 2018-09-01 13:00:26 -0400 |
| commit | 80270ba086ae3c46ca66f794c5a2111ad1efa1bb (patch) | |
| tree | 50608c90a49e59ff9b1ba08c24799d40790482c6 | |
| parent | Merge pull request #2547 from RyanDwyer/fix-reload-crash (diff) | |
| parent | Fix crash when running deferred commands (diff) | |
| download | sway-80270ba086ae3c46ca66f794c5a2111ad1efa1bb.tar.gz sway-80270ba086ae3c46ca66f794c5a2111ad1efa1bb.tar.zst sway-80270ba086ae3c46ca66f794c5a2111ad1efa1bb.zip | |
Merge pull request #2544 from RyanDwyer/fix-deferred-cmd-crash
Fix crash when running deferred commands
| -rw-r--r-- | sway/input/seat.c | 2 |
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, | |||
| 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 | ||