Showing the changes to interface/src/Menu.cpp (1 of 8 files). Show all
Unified · Split
| @@ -36,11 +36,18 @@ · 35 unmodified lines | ||
| 36 | 36 | Menu* Menu::_instance = NULL; |
| 37 | 37 | |
| 38 | 38 | Menu* Menu::getInstance() { |
| 39 | + static QMutex menuInstanceMutex; | |
| 40 | + | |
| 41 | + // lock the menu instance mutex to make sure we don't race and create two menus and crash | |
| 42 | + menuInstanceMutex.lock(); | |
| 43 | + | |
| 39 | 44 | if (!_instance) { |
| 40 | 45 | qDebug("First call to Menu::getInstance() - initing menu.\n"); |
| 41 | 46 | |
| 42 | 47 | _instance = new Menu(); |
| 43 | 48 | } |
| 49 | + | |
| 50 | + menuInstanceMutex.unlock(); | |
| 44 | 51 | |
| 45 | 52 | return _instance; |
| 46 | 53 | } |
| @@ -477,8 +484,10 @@ Menu::Menu() : · 430 unmodified lines | ||
| 477 | 484 | addCheckableActionToQMenuAndActionHash(renderDebugMenu, MenuOption::CoverageMapV2, Qt::SHIFT | Qt::CTRL | Qt::Key_P); |
| 478 | 485 | |
| 479 | 486 | QMenu* audioDebugMenu = developerMenu->addMenu("Audio Debugging Tools"); |
| 480 | − addCheckableActionToQMenuAndActionHash(audioDebugMenu, MenuOption::EchoAudio); | |
| 481 | − | |
| 487 | + addCheckableActionToQMenuAndActionHash(audioDebugMenu, MenuOption::EchoServerAudio); | |
| 488 | + addCheckableActionToQMenuAndActionHash(audioDebugMenu, MenuOption::EchoLocalAudio); | |
| 489 | + | |
| 490 | + | |
| 482 | 491 | addCheckableActionToQMenuAndActionHash(developerMenu, MenuOption::ExtraDebugging); |
| 483 | 492 | addActionToQMenuAndActionHash(developerMenu, MenuOption::PasteToVoxel, |
| 484 | 493 | Qt::CTRL | Qt::SHIFT | Qt::Key_V, |