فهرست منبع

glxdisplay: remove lock in dtor, which causes crash on shutdown

rdb 7 سال پیش
والد
کامیت
da079c5ffe
1فایلهای تغییر یافته به همراه3 افزوده شده و 1 حذف شده
  1. 3 1
      panda/src/glxdisplay/glxGraphicsStateGuardian.cxx

+ 3 - 1
panda/src/glxdisplay/glxGraphicsStateGuardian.cxx

@@ -64,7 +64,9 @@ glxGraphicsStateGuardian(GraphicsEngine *engine, GraphicsPipe *pipe,
  */
  */
 glxGraphicsStateGuardian::
 glxGraphicsStateGuardian::
 ~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();
   destroy_temp_xwindow();
   if (_visuals != nullptr) {
   if (_visuals != nullptr) {
     XFree(_visuals);
     XFree(_visuals);