diff options
author | 2018-10-16 10:50:56 +0100 | |
---|---|---|
committer | 2018-10-16 10:50:56 +0100 | |
commit | ac20690945f1cd44c4c22267c9e7a172ebcf5ba5 (patch) | |
tree | 994739d4ba8388d7a336ac825a618daf2274ec66 /swaybg | |
parent | Prevent duplicate workspace::focus events (diff) | |
parent | Merge pull request #2845 from colemickens/posix_clock (diff) | |
download | sway-ac20690945f1cd44c4c22267c9e7a172ebcf5ba5.tar.gz sway-ac20690945f1cd44c4c22267c9e7a172ebcf5ba5.tar.zst sway-ac20690945f1cd44c4c22267c9e7a172ebcf5ba5.zip |
Merge branch 'master' into set-set-raw-focus
Diffstat (limited to 'swaybg')
-rw-r--r-- | swaybg/main.c | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/swaybg/main.c b/swaybg/main.c index 742669ef..45b7a913 100644 --- a/swaybg/main.c +++ b/swaybg/main.c | |||
@@ -222,7 +222,12 @@ int main(int argc, const char **argv) { | |||
222 | } | 222 | } |
223 | 223 | ||
224 | state.display = wl_display_connect(NULL); | 224 | state.display = wl_display_connect(NULL); |
225 | assert(state.display); | 225 | if (!state.display) { |
226 | wlr_log(WLR_ERROR, "Unable to connect to the compositor. " | ||
227 | "If your compositor is running, check or set the " | ||
228 | "WAYLAND_DISPLAY environment variable."); | ||
229 | return 1; | ||
230 | } | ||
226 | 231 | ||
227 | struct wl_registry *registry = wl_display_get_registry(state.display); | 232 | struct wl_registry *registry = wl_display_get_registry(state.display); |
228 | wl_registry_add_listener(registry, ®istry_listener, &state); | 233 | wl_registry_add_listener(registry, ®istry_listener, &state); |