aboutsummaryrefslogtreecommitdiff
path: root/examples
diff options
context:
space:
mode:
authorScott Anderson <ascent12@hotmail.com>2017-07-10 13:46:15 +1200
committerScott Anderson <ascent12@hotmail.com>2017-07-10 13:46:15 +1200
commitceef12cb5a2a9347a1494332d320742c92fbd539 (patch)
tree8b70817fe1ca341cb9868f49f4127e4e987da68a /examples
parent5b8ec107b9ca91ef8d81ce4e561605b808b6a03e (diff)
Exit cleanly if we cannot open Wayland socket.
Diffstat (limited to 'examples')
-rw-r--r--examples/shared.c10
1 files changed, 10 insertions, 0 deletions
diff --git a/examples/shared.c b/examples/shared.c
index fbb6c559..6d225a85 100644
--- a/examples/shared.c
+++ b/examples/shared.c
@@ -466,6 +466,7 @@ void compositor_init(struct compositor_state *state) {
struct wlr_backend *wlr = wlr_backend_autocreate(
state->display, state->session);
if (!wlr) {
+ wlr_session_finish(state->session);
exit(1);
}
wl_signal_add(&wlr->events.input_add, &state->input_add);
@@ -477,10 +478,19 @@ void compositor_init(struct compositor_state *state) {
clock_gettime(CLOCK_MONOTONIC, &state->last_frame);
const char *socket = wl_display_add_socket_auto(state->display);
+ if (!socket) {
+ wlr_log_errno(L_ERROR, "Unable to open wayland socket");
+ wlr_backend_destroy(wlr);
+ wlr_session_finish(state->session);
+ exit(1);
+ }
+
wlr_log(L_INFO, "Running compositor on wayland display '%s'", socket);
setenv("_WAYLAND_DISPLAY", socket, true);
if (!wlr_backend_init(state->backend)) {
wlr_log(L_ERROR, "Failed to initialize backend");
+ wlr_backend_destroy(wlr);
+ wlr_session_finish(state->session);
exit(1);
}
}