From 9da5bee1788d62226d95ded977810ebca05776ec Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Fri, 1 May 2020 14:59:16 +0530
Subject: [PATCH] X11: Filter out Xlib errors from other connections

https://github.com/glfw/glfw/commit/2c8e0512ddb1e8baa73c5b8a03a79aedb4e5939d
---
 glfw/x11_init.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/glfw/x11_init.c b/glfw/x11_init.c
index 2408f62d0..dab6f6809 100644
--- a/glfw/x11_init.c
+++ b/glfw/x11_init.c
@@ -502,8 +502,10 @@ static Window createHelperWindow(void)
 
 // X error handler
 //
-static int errorHandler(Display *display UNUSED, XErrorEvent* event)
+static int errorHandler(Display *display, XErrorEvent* event)
 {
+    if (_glfw.x11.display != display)
+        return 0;
     _glfw.x11.errorCode = event->error_code;
     return 0;
 }