From e6f05b6b211b1515dd9e86d8700b266e0b6ef93c Mon Sep 17 00:00:00 2001
|
From: Jeffy Chen <jeffy.chen@rock-chips.com>
|
Date: Wed, 8 Jun 2022 09:53:19 +0800
|
Subject: [PATCH 69/74] desktop-shell: Fix crash when destroying uncommited
|
surface
|
|
By adding a sanity check for it's wsurface_anim_fade.
|
|
Signed-off-by: Jeffy Chen <jeffy.chen@rock-chips.com>
|
---
|
desktop-shell/shell.c | 4 +++-
|
1 file changed, 3 insertions(+), 1 deletion(-)
|
|
diff --git a/desktop-shell/shell.c b/desktop-shell/shell.c
|
index 1fc2f3b..cc0246e 100644
|
--- a/desktop-shell/shell.c
|
+++ b/desktop-shell/shell.c
|
@@ -275,7 +275,9 @@ desktop_shell_destroy_surface(struct shell_surface *shsurf)
|
weston_view_destroy(shsurf->view);
|
|
wl_signal_emit(&shsurf->destroy_signal, shsurf);
|
- weston_surface_destroy(shsurf->wsurface_anim_fade);
|
+
|
+ if (shsurf->wsurface_anim_fade)
|
+ weston_surface_destroy(shsurf->wsurface_anim_fade);
|
|
if (shsurf->output_destroy_listener.notify) {
|
wl_list_remove(&shsurf->output_destroy_listener.link);
|
--
|
2.20.1
|
