client: Don't make EPIPE fatal if triggered when flushing

If flushing hits EPIPE it should not make it a fatal error since it
would make it impossible to process the rest of the data available in
the buffer. Instead, let reading the socket make EPIPE fatal, letting
the client have the possibility to process the last messages including
any error causing the termination.

Signed-off-by: Jonas Ådahl <jadahl@gmail.com>
Reviewed-by: Daniel Stone <daniels@collabora.com>

diff --git a/src/wayland-client.c b/src/wayland-client.c
index 33eb247..69f91a6 100644 (file)
--- a/src/wayland-client.c
+++ b/src/wayland-client.c
@@ -1498,10 +1498,10 @@ wl_display_dispatch_queue(struct wl_display *display,
                return ret;
        }
 
-       /* We ignore EPIPE here, so that we try to read events before
-        * returning an error.  When the compositor sends an error it
-        * will close the socket, and if we bail out here we don't get
-        * a chance to process the error. */
+       /* We ignore EPIPE here, so that we try to read events before
+        * returning an error.  When the compositor sends an error it
+        * will close the socket, and if we bail out here we don't get
+        * a chance to process the error. */
        ret = wl_connection_flush(display->connection);
        if (ret < 0 && errno != EAGAIN && errno != EPIPE) {
                display_fatal_error(display, errno);
@@ -1727,8 +1727,12 @@ wl_display_flush(struct wl_display *display)
                errno = display->last_error;
                ret = -1;
        } else {
+               /* We don't make EPIPE a fatal error here, so that we may try to
+                * read events after the failed flush. When the compositor sends
+                * an error it will close the socket, and if we make EPIPE fatal
+                * here we don't get a chance to process the error. */
                ret = wl_connection_flush(display->connection);
-               if (ret < 0 && errno != EAGAIN)
+               if (ret < 0 && errno != EAGAIN && errno != EPIPE)
                        display_fatal_error(display, errno);
        }