diff options
author | Ryan Dwyer <ryandwyer1@gmail.com> | 2018-10-15 21:57:59 +1000 |
---|---|---|
committer | Ryan Dwyer <ryandwyer1@gmail.com> | 2018-10-15 21:57:59 +1000 |
commit | 32ba8154b8f5f15b2c778dd404f3acb5becc1719 (patch) | |
tree | 82800feb0bf4b5b96aa5d7f69a38c09be5676a32 /swaynag/swaynag.c | |
parent | Merge pull request #2831 from swaywm/move-output-docs (diff) | |
download | sway-32ba8154b8f5f15b2c778dd404f3acb5becc1719.tar.gz sway-32ba8154b8f5f15b2c778dd404f3acb5becc1719.tar.zst sway-32ba8154b8f5f15b2c778dd404f3acb5becc1719.zip |
Sway clients: Exit gracefully when compositor is unavailable
Diffstat (limited to 'swaynag/swaynag.c')
-rw-r--r-- | swaynag/swaynag.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/swaynag/swaynag.c b/swaynag/swaynag.c index 69da851e..fa6bbe05 100644 --- a/swaynag/swaynag.c +++ b/swaynag/swaynag.c | |||
@@ -342,7 +342,11 @@ static const struct wl_registry_listener registry_listener = { | |||
342 | 342 | ||
343 | void swaynag_setup(struct swaynag *swaynag) { | 343 | void swaynag_setup(struct swaynag *swaynag) { |
344 | swaynag->display = wl_display_connect(NULL); | 344 | swaynag->display = wl_display_connect(NULL); |
345 | assert(swaynag->display); | 345 | if (!swaynag->display) { |
346 | sway_abort("Unable to connect to the compositor. " | ||
347 | "If your compositor is running, check or set the " | ||
348 | "WAYLAND_DISPLAY environment variable."); | ||
349 | } | ||
346 | 350 | ||
347 | swaynag->scale = 1; | 351 | swaynag->scale = 1; |
348 | wl_list_init(&swaynag->outputs); | 352 | wl_list_init(&swaynag->outputs); |