mirrors/sway
1
0
Fork 0
mirror of https://github.com/swaywm/sway.git synced 2024-11-26 01:41:30 +00:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse source 
fix crash on fullscreen toggle
This commit is contained in:
Ryan Dwyer 2018-05-12 18:00:29 +10:00 committed by GitHub
parent 2511adffc2 4717c71da5
commit 7f03570caf
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 9 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
sway/tree/view.c
View file

@ -188,8 +188,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);
@ -197,6 +198,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;