diff options
| author | sghctoma <sghctoma@gmail.com> | 2018-09-03 08:57:17 +0200 |
|---|---|---|
| committer | sghctoma <sghctoma@gmail.com> | 2018-09-03 08:57:17 +0200 |
| commit | df730a88919b078093dbc322926ada219a60d036 (patch) | |
| tree | f2837f24092c7be5dfccdf448e47062cb5718549 /sway/input | |
| parent | 67188b7cba2a985926647e049ed32c72b6ee98c8 (diff) | |
| parent | c9276f04c9fae7a211164003bc9cb8b4369db5fd (diff) | |
Merge remote-tracking branch 'upstream/master' into fix-freebsd-build
Diffstat (limited to 'sway/input')
| -rw-r--r-- | sway/input/seat.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sway/input/seat.c b/sway/input/seat.c index 36e1d232..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); } @@ -779,7 +779,7 @@ void seat_set_focus_layer(struct sway_seat *seat, wlr_log(WLR_DEBUG, "Returning focus to %p %s '%s'", previous, container_type_to_str(previous->type), previous->name); // Hack to get seat to re-focus the return value of get_focus - seat_set_focus(seat, previous->parent); + seat_set_focus(seat, NULL); seat_set_focus(seat, previous); } return; |