mirrors
/
weston
mirror of https://gitlab.freedesktop.org/wayland/weston.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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 <pekka.paalanen@collabora.com>
This commit is contained in:
Pekka Paalanen 2019-02-06 10:44:37 +02:00 committed by Daniel Stone
parent 6e229ca263
commit 052032d730
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
desktop-shell/shell.c
View File

@ -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;
}