Merge pull request #2580 from RyanDwyer/fix-focus-after-fullscreen

Restore focus correctly when closing a fullscreen view

1 files changed, 2 insertions, 5 deletions

diff --git a/sway/input/seat.c b/sway/input/seat.c
index 92d9d7ec..b1808793 100644
--- a/sway/input/seat.c
+++ b/sway/input/seat.c
@@ -168,11 +168,8 @@ static void handle_seat_node_destroy(struct wl_listener *listener, void *data) {
 
                 // the structure change might have caused it to move up to the top of
                 // the focus stack without sending focus notifications to the view
-                if (seat_get_focus(seat) == next_focus) {
-                        seat_send_focus(next_focus, seat);
-                } else {
-                        seat_set_focus(seat, next_focus);
-                }
+                seat_send_focus(next_focus, seat);
+                seat_set_focus(seat, next_focus);
         }
 }