From da079c5ffea85c110627044a920a3ffcd147bba0 Mon Sep 17 00:00:00 2001
From: rdb <git@rdb.name>
Date: Tue, 27 Nov 2018 17:09:46 +0100
Subject: [PATCH] glxdisplay: remove lock in dtor, which causes crash on
 shutdown

---
 panda/src/glxdisplay/glxGraphicsStateGuardian.cxx | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/panda/src/glxdisplay/glxGraphicsStateGuardian.cxx b/panda/src/glxdisplay/glxGraphicsStateGuardian.cxx
index 86ddeac589..d620427afa 100644
--- a/panda/src/glxdisplay/glxGraphicsStateGuardian.cxx
+++ b/panda/src/glxdisplay/glxGraphicsStateGuardian.cxx
@@ -64,7 +64,9 @@ glxGraphicsStateGuardian(GraphicsEngine *engine, GraphicsPipe *pipe,
  */
 glxGraphicsStateGuardian::
 ~glxGraphicsStateGuardian() {
-  LightReMutexHolder holder(glxGraphicsPipe::_x_mutex);
+  // Actually, the lock might have already destructed, so we can't reliably
+  // grab the X11 lock here.
+  //LightReMutexHolder holder(glxGraphicsPipe::_x_mutex);
   destroy_temp_xwindow();
   if (_visuals != nullptr) {
     XFree(_visuals);