aboutsummaryrefslogtreecommitdiff
path: root/swaybar
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 /swaybar
parent56c388b51076c3d96363e6afb62d0138cd3dce36 (diff)
downloadsway-32ba8154b8f5f15b2c778dd404f3acb5becc1719.tar.xz
Sway clients: Exit gracefully when compositor is unavailable
Diffstat (limited to 'swaybar')
-rw-r--r--swaybar/bar.c6
1 files changed, 5 insertions, 1 deletions
diff --git a/swaybar/bar.c b/swaybar/bar.c
index be290c18..0deba72d 100644
--- a/swaybar/bar.c
+++ b/swaybar/bar.c
@@ -586,7 +586,11 @@ bool bar_setup(struct swaybar *bar, const char *socket_path) {
}
bar->display = wl_display_connect(NULL);
- assert(bar->display);
+ if (!bar->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(bar->display);
wl_registry_add_listener(registry, &registry_listener, bar);