sway

commit 7f03570caf747b07f8da28e58cc8074f4f6bc33d
parent 2511adffc29996b64d01d85b3de31de9a2af9096
Author: Ryan Dwyer <RyanDwyer@users.noreply.github.com>
Date:   Sat, 12 May 2018 18:00:29 +1000

Merge pull request #1952 from Dudemanguy911/fix-crash-on-fullscreen

fix crash on fullscreen toggle
Diffstat:
M
sway/tree/view.c
 | 
16
+++++++++-------

1 file changed, 9 insertions(+), 7 deletions(-)
diff --git a/sway/tree/view.c b/sway/tree/view.c
@@ -188,13 +188,15 @@ void view_set_fullscreen_raw(struct sway_view *view, bool fullscreen) {
 		struct sway_container *focus, *focus_ws;
 		wl_list_for_each(seat, &input_manager->seats, link) {
 			focus = seat_get_focus(seat);
-			focus_ws = focus;
-			if (focus_ws->type != C_WORKSPACE) {
-				focus_ws = container_parent(focus_ws, C_WORKSPACE);
-			}
-			seat_set_focus(seat, view->swayc);
-			if (focus_ws != workspace) {
-				seat_set_focus(seat, focus);
+			if (focus) {
+				focus_ws = focus;
+				if (focus && focus_ws->type != C_WORKSPACE) {
+					focus_ws = container_parent(focus_ws, C_WORKSPACE);
+				}
+				seat_set_focus(seat, view->swayc);
+				if (focus_ws != workspace) {
+					seat_set_focus(seat, focus);
+				}
 			}
 		}
 	} else {