From 25e441e8e92688e596e4976b32818141d9fa3aab Mon Sep 17 00:00:00 2001
From: Brian Paul <brian.paul@tungstengraphics.com>
Date: Wed, 4 Oct 2006 16:22:24 +0000
Subject: [PATCH] in MakeContextCurrent() use old display pointer for
 __glXSetupForCommand(), bug 8443

---
 src/glx/x11/glxext.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/glx/x11/glxext.c b/src/glx/x11/glxext.c
index d4edf6d85d9..ab2795efbe5 100644
--- a/src/glx/x11/glxext.c
+++ b/src/glx/x11/glxext.c
@@ -1582,7 +1582,7 @@ USED static Bool MakeContextCurrent(Display *dpy, GLXDrawable draw,
     }
 
     oldGC = __glXGetCurrentContext();
-    oldOpcode = (gc == oldGC) ? opcode : __glXSetupForCommand(dpy);
+    oldOpcode = (gc == oldGC) ? opcode : __glXSetupForCommand(oldGC->currentDpy);
     if (!oldOpcode) {
 	return GL_FALSE;
     }
-- 
2.30.2