From: Pekka Paalanen <[email protected]>

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 <[email protected]>
Signed-off-by: Fabien Lahoudere <[email protected]>
---
 desktop-shell/shell.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/desktop-shell/shell.c b/desktop-shell/shell.c
index e6ce20b..1edd37b 100644
--- a/desktop-shell/shell.c
+++ b/desktop-shell/shell.c
@@ -3735,7 +3735,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);
 
-- 
1.8.3.1

_______________________________________________
wayland-devel mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/wayland-devel

Reply via email to