1 files changed, 20 insertions, 5 deletions

diff --git a/util/fluxbox-remote.cc b/util/fluxbox-remote.cc
index 05f251a..5c66583 100644
--- a/util/fluxbox-remote.cc
+++ b/util/fluxbox-remote.cc
@@ -25,6 +25,14 @@
 #include <stdlib.h>
 #include <stdio.h>
 
+bool g_gotError;
+static int HandleIPCError(Display *disp, XErrorEvent*ptr)
+{
+        // ptr->error_code contains the actual error flags
+        g_gotError=true;
+        return( 0 );
+}
+
 int main(int argc, char **argv) {
 
     if (argc <= 1) {
@@ -42,14 +50,21 @@ int main(int argc, char **argv) {
     Window root = DefaultRootWindow(disp);
 
     char *str = argv[1];
-    int ret = XChangeProperty(disp, root, fbcmd_atom,
+
+    typedef int (*x_error_handler_t)(Display*,XErrorEvent*);
+
+    // assign the custom handler, clear the flag, sync the data, then check it for success/failure
+    x_error_handler_t handler = XSetErrorHandler( HandleIPCError );
+    g_gotError=false;
+    XChangeProperty(disp, root, fbcmd_atom,
                               XA_STRING, 8, PropModeReplace,
                               (unsigned char *) str, strlen(str));
-    XCloseDisplay(disp);
+    XSync(disp,False);
+    int ret=(g_gotError?EXIT_FAILURE:EXIT_SUCCESS);
+    XSetErrorHandler(handler);
 
-    if (ret == Success)
-        return EXIT_SUCCESS;
+    XCloseDisplay(disp);
 
-    return EXIT_FAILURE;
+    return ret;
 }