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

fix crash on fullscreen toggle

1 files changed, 9 insertions, 7 deletions

diff --git a/sway/tree/view.c b/sway/tree/view.c
index ca84d82e..3b3b6eaf 100644
--- 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 {