Fix restart issue of X11 software screen grabber

corckie · Dec 15, 2021 · aa91277 · aa91277
1 parent c8049f1
commit aa91277
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 1 deletion.
diff --git a/libsrc/grabber/X11/X11Grabber.cpp b/libsrc/grabber/X11/X11Grabber.cpp
@@ -231,6 +231,7 @@ void X11Grabber::stop()
 		{
 			_uninitX11Display(_handle);
 			_handle = nullptr;
+			_initialized = false;
 		}
 		_semaphore.release();
 		Info(_log, "Stopped");

diff --git a/libsrc/grabber/X11/smartX11.cpp b/libsrc/grabber/X11/smartX11.cpp
@@ -13,7 +13,7 @@ struct x11Displays* enumerateX11Displays()
 
 	auto dispCount = ScreenCount(myDisplay);
 
-	if (dispCount < 0)
+	if (dispCount <= 0)
 	{
 		XCloseDisplay(myDisplay);
 		return nullptr;
@@ -51,6 +51,13 @@ void releaseX11Displays(struct x11Displays* buffer)
 	free(buffer);
 }
 
+static int x11errorHandler(Display* d, XErrorEvent* e)
+{
+	return 0;
+}
+
+static XErrorHandler oldHandler = nullptr;
+
 x11Handle* initX11Display(int display)
 {	
 	Display* maindisplay = XOpenDisplay(NULL);
@@ -67,6 +74,8 @@ x11Handle* initX11Display(int display)
 	retVal->height = 0;
 	retVal->size = 0;
 
+	oldHandler = XSetErrorHandler(x11errorHandler);
+
 	return retVal;
 }
 
@@ -83,6 +92,12 @@ void releaseFrame(x11Handle* retVal)
 
 void uninitX11Display(x11Handle* retVal)
 {
+	if (oldHandler != nullptr)
+	{
+		XSetErrorHandler(oldHandler);
+		oldHandler = nullptr;
+	}
+
 	if (retVal == nullptr)
 		return;