From: Manuel Stoeckl <code@mstoeckl.com>
Date: Sat, 13 Jul 2019 21:54:14 +0000 (-0400)
Subject: client: Don't abort when sending a request fails
X-Git-Tag: 1.17.91~30
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=8a831ac6ec359c0dff67d2f4221fcd48a3a9a4ce;p=platform%2Fupstream%2Fwayland.git

client: Don't abort when sending a request fails

Instead, set a fatal display error which will let an application
using libwayland-client shutdown cleanly.

Signed-off-by: Manuel Stoeckl <code@mstoeckl.com>
---

diff --git a/src/wayland-client.c b/src/wayland-client.c
index 7c93c7b..5358500 100644
--- a/src/wayland-client.c
+++ b/src/wayland-client.c
@@ -745,14 +745,19 @@ wl_proxy_marshal_array_constructor_versioned(struct wl_proxy *proxy,
 	}
 
 	closure = wl_closure_marshal(&proxy->object, opcode, args, message);
-	if (closure == NULL)
-		wl_abort("Error marshalling request: %s\n", strerror(errno));
+	if (closure == NULL) {
+		wl_log("Error marshalling request: %s\n", strerror(errno));
+		display_fatal_error(proxy->display, errno);
+		goto err_unlock;
+	}
 
 	if (debug_client)
 		wl_closure_print(closure, &proxy->object, true);
 
-	if (wl_closure_send(closure, proxy->display->connection))
-		wl_abort("Error sending request: %s\n", strerror(errno));
+	if (wl_closure_send(closure, proxy->display->connection)) {
+		wl_log("Error sending request: %s\n", strerror(errno));
+		display_fatal_error(proxy->display, errno);
+	}
 
 	wl_closure_destroy(closure);