aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDudemanguy911 <random342@airmail.cc>2018-05-11 01:20:20 +0000
committerDudemanguy911 <random342@airmail.cc>2018-05-11 07:42:56 -0500
commit935bda0f336bb9ca45a7fb96d7ed5f08ef04432f (patch)
tree44f348b09ec2f9f14ff399787cba3e228dd00b0f
parent8d99edf7870fbf4bf72837d0dded3991ceed0a95 (diff)
downloadsway-935bda0f336bb9ca45a7fb96d7ed5f08ef04432f.tar.xz
fix crash on fullscreen toggle
-rw-r--r--sway/tree/view.c16
1 files changed, 9 insertions, 7 deletions
diff --git a/sway/tree/view.c b/sway/tree/view.c
index afd7eade..424c1084 100644
--- a/sway/tree/view.c
+++ b/sway/tree/view.c
@@ -163,13 +163,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 {