desktop-shell: do not lower_fullscreen_layer(s, NULL)

In activate, do not call lower_fullscreen_layer() at all if the output
is NULL. It should not do anything in that case, per the existing
comment.

This is a tentative crash fix for a case where there are no enabled
weston_outputs at all.

Signed-off-by: Pekka Paalanen <pekka.paalanen@collabora.co.uk>
Signed-off-by: Fabien Lahoudere <fabien.lahoudere@collabora.com>
Reviewed-by: Ian Ray <ian.ray@ge.com>

diff --git a/desktop-shell/shell.c b/desktop-shell/shell.c
index f87151d..fb2d5e8 100644 (file)
--- a/desktop-shell/shell.c
+++ b/desktop-shell/shell.c
@@ -3775,7 +3775,8 @@ activate(struct desktop_shell *shell, struct weston_view *view,
 
        /* Only demote fullscreen surfaces on the output of activated shsurf.
         * Leave fullscreen surfaces on unrelated outputs alone. */
-       lower_fullscreen_layer(shell, shsurf->output);
+       if (shsurf->output)
+               lower_fullscreen_layer(shell, shsurf->output);
 
        weston_view_activate(view, seat, flags);