From 052032d7306ca745670547870dfe0bdce65647af Mon Sep 17 00:00:00 2001 From: Pekka Paalanen Date: Wed, 6 Feb 2019 10:44:37 +0200 Subject: [PATCH] desktop-shell: use weston_compositor_exit Use the proper weston_compositor_exit API instead of wl_display_terminate() to allow the compositor main to prepare for exit, and most importantly to set the exit error code as appropriate. I have some brokenness in my test suite running, and weston-desktop-shell was crashing at start, yet the tests did not notice. With this patch, the tests where the helper crashes are properly marked as failed. Signed-off-by: Pekka Paalanen --- desktop-shell/shell.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/desktop-shell/shell.c b/desktop-shell/shell.c index 2d6d7c20..809f31c8 100644 --- a/desktop-shell/shell.c +++ b/desktop-shell/shell.c @@ -3536,7 +3536,7 @@ terminate_binding(struct weston_keyboard *keyboard, const struct timespec *time, { struct weston_compositor *compositor = data; - wl_display_terminate(compositor->wl_display); + weston_compositor_exit(compositor); } static void @@ -4289,7 +4289,8 @@ check_desktop_shell_crash_too_early(struct desktop_shell *shell) weston_log("Error: %s apparently cannot run at all.\n", shell->client); weston_log_continue(STAMP_SPACE "Quitting..."); - wl_display_terminate(shell->compositor->wl_display); + weston_compositor_exit_with_code(shell->compositor, + EXIT_FAILURE); return true; }