浏览代码

x11display: fix threaded crash when using get_keyboard_map()

rdb 6 年之前
父节点
当前提交
6a008ae724
共有 1 个文件被更改,包括 2 次插入0 次删除
  1. 2 0
      panda/src/x11display/x11GraphicsWindow.cxx

+ 2 - 0
panda/src/x11display/x11GraphicsWindow.cxx

@@ -1976,6 +1976,8 @@ get_keyboard_map() const {
   // XkbGetMap(_display, XkbAllMapComponentsMask, XkbUseCoreKbd);
   // XkbGetMap(_display, XkbAllMapComponentsMask, XkbUseCoreKbd);
   ButtonMap *map = new ButtonMap;
   ButtonMap *map = new ButtonMap;
 
 
+  LightReMutexHolder holder(x11GraphicsPipe::_x_mutex);
+
   for (int k = 9; k <= 135; ++k) {
   for (int k = 9; k <= 135; ++k) {
     ButtonHandle raw_button = map_raw_button(k);
     ButtonHandle raw_button = map_raw_button(k);
     if (raw_button == ButtonHandle::none()) {
     if (raw_button == ButtonHandle::none()) {