desktop: Fix activating unmapped views

This can happen sometimes in xwayland, need to guard against this.

Signed-off-by: Joshua Ashton <joshua@froggi.es>

diff --git a/src/desktop.c b/src/desktop.c
index 0e68387934067e1e4cfbf2c6c43cf1ed6e2e1f26..ba562c29f2407b8fc65074e6f4a8509c8b2a1ec6 100644 (file)
--- a/src/desktop.c
+++ b/src/desktop.c
@@ -102,7 +102,8 @@ desktop_focus_and_activate_view(struct seat *seat, struct view *view)
                seat_focus_surface(seat, NULL);
                return;
        }
-       if (input_inhibit_blocks_surface(seat, view->surface->resource)) {
+
+       if (view->surface && input_inhibit_blocks_surface(seat, view->surface->resource)) {
                return;
        }
 
@@ -114,7 +115,8 @@ desktop_focus_and_activate_view(struct seat *seat, struct view *view)
                view_minimize(view, false);
                return;
        }
-       if (!view->mapped) {
+
+       if (!view->mapped || !view->surface) {
                return;
        }