3 files changed, 22 insertions, 4 deletions

diff --git a/swaybar/bar.c b/swaybar/bar.c
index 88de8c04..08c386a7 100644
--- a/swaybar/bar.c
+++ b/swaybar/bar.c
@@ -415,7 +415,10 @@ void bar_run(struct swaybar *bar) {
                                 status_in, bar);
         }
         while (1) {
-                wl_display_flush(bar->display);
+                errno = 0;
+                if (wl_display_flush(bar->display) == -1 && errno != EAGAIN) {
+                        break;
+                }
                 loop_poll(bar->eventloop);
         }
 }
diff --git a/swaylock/main.c b/swaylock/main.c
index f88663c2..9b74b671 100644
--- a/swaylock/main.c
+++ b/swaylock/main.c
@@ -2,6 +2,7 @@
 #define _POSIX_C_SOURCE 200112L
 #include <assert.h>
 #include <ctype.h>
+#include <errno.h>
 #include <fcntl.h>
 #include <getopt.h>
 #include <stdbool.h>
@@ -844,7 +845,9 @@ static int load_config(char *path, struct swaylock_state *state,
 static struct swaylock_state state;
 
 static void display_in(int fd, short mask, void *data) {
-        wl_display_dispatch(state.display);
+        if (wl_display_dispatch(state.display) == -1) {
+                state.run_display = false;
+        }
 }
 
 int main(int argc, char **argv) {
@@ -928,6 +931,11 @@ int main(int argc, char **argv) {
         }
 
         zwlr_input_inhibit_manager_v1_get_inhibitor(state.input_inhibit_manager);
+        if (wl_display_roundtrip(state.display) == -1) {
+                wlr_log(WLR_ERROR, "Exiting - failed to inhibit input:"
+                                " is another lockscreen already running?");
+                return 2;
+        }
 
         if (state.zxdg_output_manager) {
                 struct swaylock_surface *surface;
@@ -959,7 +967,10 @@ int main(int argc, char **argv) {
 
         state.run_display = true;
         while (state.run_display) {
-                wl_display_flush(state.display);
+                errno = 0;
+                if (wl_display_flush(state.display) == -1 && errno != EAGAIN) {
+                        break;
+                }
                 loop_poll(state.eventloop);
         }
 
diff --git a/swaylock/password.c b/swaylock/password.c
index fecaecbf..6138e1fe 100644
--- a/swaylock/password.c
+++ b/swaylock/password.c
@@ -1,5 +1,6 @@
 #define _XOPEN_SOURCE 500
 #include <assert.h>
+#include <errno.h>
 #include <pwd.h>
 #include <stdlib.h>
 #include <string.h>
@@ -97,7 +98,10 @@ void swaylock_handle_key(struct swaylock_state *state,
                                 state->eventloop, 50, handle_preverify_timeout, state);
 
                 while (state->run_display && state->verify_password_timer) {
-                        wl_display_flush(state->display);
+                        errno = 0;
+                        if (wl_display_flush(state->display) == -1 && errno != EAGAIN) {
+                                break;
+                        }
                         loop_poll(state->eventloop);
 
                         bool ok = 1;