fix crash on fullscreen toggle

This commit is contained in:
Dudemanguy911 2018-05-11 01:20:20 +00:00
parent 8d99edf787
commit 935bda0f33

View File

@ -163,8 +163,9 @@ void view_set_fullscreen_raw(struct sway_view *view, bool fullscreen) {
struct sway_container *focus, *focus_ws; struct sway_container *focus, *focus_ws;
wl_list_for_each(seat, &input_manager->seats, link) { wl_list_for_each(seat, &input_manager->seats, link) {
focus = seat_get_focus(seat); focus = seat_get_focus(seat);
if (focus) {
focus_ws = 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); focus_ws = container_parent(focus_ws, C_WORKSPACE);
} }
seat_set_focus(seat, view->swayc); seat_set_focus(seat, view->swayc);
@ -172,6 +173,7 @@ void view_set_fullscreen_raw(struct sway_view *view, bool fullscreen) {
seat_set_focus(seat, focus); seat_set_focus(seat, focus);
} }
} }
}
} else { } else {
workspace->sway_workspace->fullscreen = NULL; workspace->sway_workspace->fullscreen = NULL;
view->swayc->width = view->swayc->saved_width; view->swayc->width = view->swayc->saved_width;