From 87860c20ee51ccaff97849eb1e483b4d52ac22bc Mon Sep 17 00:00:00 2001 From: Pekka Paalanen Date: Wed, 2 May 2018 10:21:57 +0200 Subject: [PATCH] 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 Signed-off-by: Fabien Lahoudere Reviewed-by: Ian Ray --- 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 f87151d9..fb2d5e85 100644 --- 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);