diff options
| author | Brian Ashworth <RedSoxFan@users.noreply.github.com> | 2018-09-03 00:24:28 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-09-03 00:24:28 -0400 |
| commit | afb69688746b04d7667e1d57d9ac844bd2671570 (patch) | |
| tree | f950fd298c335abd992005a26029dbfba8010136 /sway/input | |
| parent | 349d1f3be87ad9fd49482f64c71eb2665750261b (diff) | |
| parent | 3af9588eb4aab0b4f45edf2601c9a7ff0846861f (diff) | |
| download | sway-afb69688746b04d7667e1d57d9ac844bd2671570.tar.xz | |
Merge branch 'master' into disabled-no-modeset
Diffstat (limited to 'sway/input')
| -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, // 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); } |