aboutsummaryrefslogtreecommitdiff
path: root/swaylock
diff options
context:
space:
mode:
authorRyan Dwyer <ryandwyer1@gmail.com>2018-10-15 21:57:59 +1000
committerRyan Dwyer <ryandwyer1@gmail.com>2018-10-15 21:57:59 +1000
commit32ba8154b8f5f15b2c778dd404f3acb5becc1719 (patch)
tree82800feb0bf4b5b96aa5d7f69a38c09be5676a32 /swaylock
parent56c388b51076c3d96363e6afb62d0138cd3dce36 (diff)
Sway clients: Exit gracefully when compositor is unavailable
Diffstat (limited to 'swaylock')
-rw-r--r--swaylock/main.c6
1 files changed, 5 insertions, 1 deletions
diff --git a/swaylock/main.c b/swaylock/main.c
index 27bcfe32..04c0bb07 100644
--- a/swaylock/main.c
+++ b/swaylock/main.c
@@ -908,7 +908,11 @@ int main(int argc, char **argv) {
wl_list_init(&state.surfaces);
state.xkb.context = xkb_context_new(XKB_CONTEXT_NO_FLAGS);
state.display = wl_display_connect(NULL);
- assert(state.display);
+ if (!state.display) {
+ sway_abort("Unable to connect to the compositor. "
+ "If your compositor is running, check or set the "
+ "WAYLAND_DISPLAY environment variable.");
+ }
struct wl_registry *registry = wl_display_get_registry(state.display);
wl_registry_add_listener(registry, &registry_listener, &state);