diff options
| author | Drew DeVault <sir@cmpwn.com> | 2018-10-15 15:37:17 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-10-15 15:37:17 +0200 |
| commit | f6ad4908bc2f366ccbee18889ffe35c7ee436389 (patch) | |
| tree | 8fb3b25e4e244bf32ddb4a27ecaffce9661a13c5 /swaynag/swaynag.c | |
| parent | 97b9452171f2532831a876167fe93c71541d644d (diff) | |
| parent | 32ba8154b8f5f15b2c778dd404f3acb5becc1719 (diff) | |
| download | sway-f6ad4908bc2f366ccbee18889ffe35c7ee436389.tar.xz | |
Merge pull request #2838 from RyanDwyer/compositor-unavailable-crash
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 = { void swaynag_setup(struct swaynag *swaynag) { swaynag->display = wl_display_connect(NULL); - assert(swaynag->display); + if (!swaynag->display) { + sway_abort("Unable to connect to the compositor. " + "If your compositor is running, check or set the " + "WAYLAND_DISPLAY environment variable."); + } swaynag->scale = 1; wl_list_init(&swaynag->outputs); |