Commit 052032d7 authored by Pekka Paalanen's avatar Pekka Paalanen Committed by Daniel Stone

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's avatarPekka Paalanen <pekka.paalanen@collabora.com>
parent 6e229ca2
......@@ -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;
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment