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

fix crash on fullscreen toggle
7 years ago · 7f03570caf
parent 2511adffc2 4717c71da5
commit 7f03570caf
1 changed files with 9 additions and 7 deletions
--- a/sway/tree/view.c
+++ b/sway/tree/view.c
@ -188,8 +188,9 @@ 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);
+			if (focus) {
 				focus_ws = focus;
-			if (focus_ws->type != C_WORKSPACE) {
+				if (focus && focus_ws->type != C_WORKSPACE) {
 					focus_ws = container_parent(focus_ws, C_WORKSPACE);
 				}
 				seat_set_focus(seat, view->swayc);
@ -197,6 +198,7 @@ void view_set_fullscreen_raw(struct sway_view *view, bool fullscreen) {
 					seat_set_focus(seat, focus);
 				}
 			}
+		}
 	} else {
 		workspace->sway_workspace->fullscreen = NULL;
 		view->swayc->width = view->swayc->saved_width;