Add XLib error handler

TigerVNC · Sep 25, 2024 · 1387a19 · 1387a19
1 parent c23be95
commit 1387a19
Showing 1 changed file with 9 additions and 0 deletions.
diff --git a/unix/x0vncserver/XDesktop.cxx b/unix/x0vncserver/XDesktop.cxx
@@ -214,6 +214,15 @@ XDesktop::XDesktop(Display* dpy_, Geometry *geometry_)
   }
 #endif
 
+  // Need to set an error handler for XLib because most errors are reported
+  // asynchronously and default handler terminates the process on any error.
+  XSetErrorHandler([](Display* d, XErrorEvent* ev) -> int {
+    char buff[1024];
+    XGetErrorText(d, ev->error_code, buff, sizeof(buff));
+    vlog.error("XLib error: %s", buff);
+    return 0;
+  });
+
   TXWindow::setGlobalEventHandler(this);
 }