1*4882a593SmuzhiyunFrom d94cd024be7da876a356fff16f375a562b406beb Mon Sep 17 00:00:00 2001 2*4882a593SmuzhiyunFrom: Jeffy Chen <jeffy.chen@rock-chips.com> 3*4882a593SmuzhiyunDate: Mon, 3 Oct 2022 21:03:04 +0800 4*4882a593SmuzhiyunSubject: [PATCH 78/92] desktop-shell: Fix crash when hotplugging screens 5*4882a593Smuzhiyun 6*4882a593Smuzhiyun1/ Force allowing respawn. 7*4882a593Smuzhiyun2/ Panel's output might not be available when committing. 8*4882a593Smuzhiyun 9*4882a593SmuzhiyunSigned-off-by: Jeffy Chen <jeffy.chen@rock-chips.com> 10*4882a593Smuzhiyun--- 11*4882a593Smuzhiyun desktop-shell/shell.c | 7 +++++++ 12*4882a593Smuzhiyun 1 file changed, 7 insertions(+) 13*4882a593Smuzhiyun 14*4882a593Smuzhiyundiff --git a/desktop-shell/shell.c b/desktop-shell/shell.c 15*4882a593Smuzhiyunindex 08c84c5..25d9525 100644 16*4882a593Smuzhiyun--- a/desktop-shell/shell.c 17*4882a593Smuzhiyun+++ b/desktop-shell/shell.c 18*4882a593Smuzhiyun@@ -2631,6 +2631,10 @@ panel_committed(struct weston_surface *es, int32_t sx, int32_t sy) 19*4882a593Smuzhiyun 20*4882a593Smuzhiyun view = container_of(es->views.next, struct weston_view, surface_link); 21*4882a593Smuzhiyun 22*4882a593Smuzhiyun+ /* The output might be unavaiable */ 23*4882a593Smuzhiyun+ if (!view->output) 24*4882a593Smuzhiyun+ return; 25*4882a593Smuzhiyun+ 26*4882a593Smuzhiyun get_panel_size(shell, view, &width, &height); 27*4882a593Smuzhiyun switch (shell->panel_position) { 28*4882a593Smuzhiyun case WESTON_DESKTOP_SHELL_PANEL_POSITION_TOP: 29*4882a593Smuzhiyun@@ -3947,6 +3951,8 @@ check_desktop_shell_crash_too_early(struct desktop_shell *shell) 30*4882a593Smuzhiyun if (clock_gettime(CLOCK_MONOTONIC, &now) < 0) 31*4882a593Smuzhiyun return false; 32*4882a593Smuzhiyun 33*4882a593Smuzhiyun+ /* HACK: The shell might be crashed too early when hotplugging */ 34*4882a593Smuzhiyun+#if 0 35*4882a593Smuzhiyun /* 36*4882a593Smuzhiyun * If the shell helper client dies before the session has been 37*4882a593Smuzhiyun * up for roughly 30 seconds, better just make Weston shut down, 38*4882a593Smuzhiyun@@ -3962,6 +3968,7 @@ check_desktop_shell_crash_too_early(struct desktop_shell *shell) 39*4882a593Smuzhiyun 40*4882a593Smuzhiyun return true; 41*4882a593Smuzhiyun } 42*4882a593Smuzhiyun+#endif 43*4882a593Smuzhiyun 44*4882a593Smuzhiyun return false; 45*4882a593Smuzhiyun } 46*4882a593Smuzhiyun-- 47*4882a593Smuzhiyun2.20.1 48*4882a593Smuzhiyun 49