From 284dcb2dc747f783f767121fe01fa7202da30e4e Mon Sep 17 00:00:00 2001 From: Dominique Martinet Date: Sun, 29 Mar 2020 10:09:29 +0200 Subject: [PATCH] swaynag: exit on wl_display_roundtrip error fixes loop when sway closes the socket in the middle of querying outputs, see #5138. --- swaynag/swaynag.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/swaynag/swaynag.c b/swaynag/swaynag.c index 06700e47..4e692b14 100644 --- a/swaynag/swaynag.c +++ b/swaynag/swaynag.c @@ -444,7 +444,11 @@ void swaynag_setup(struct swaynag *swaynag) { assert(swaynag->compositor && swaynag->layer_shell && swaynag->shm); while (swaynag->querying_outputs > 0) { - wl_display_roundtrip(swaynag->display); + if (wl_display_roundtrip(swaynag->display) < 0) { + sway_log(SWAY_ERROR, "Error during outputs init."); + swaynag_destroy(swaynag); + exit(EXIT_FAILURE); + } } if (!swaynag->output && swaynag->type->output) {