Merge pull request #2838 from RyanDwyer/compositor-unavailable-crash

Sway clients: Exit gracefully when compositor is unavailable

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);