History

Merge branch 'master' of https://github.com/worklist/hifi into compressed_packets

ZappoMan committed 12 years ago

Commit 0e501f42 parents f527ed6 cd1fa388 files · +331 −37Browse files

Showing the changes to interface/src/Menu.cpp (1 of 8 files). Show all

Unified · Split

interface/src/Menu.cpp+11−2
@@ -36,11 +36,18 @@ · 35 unmodified lines
3636 Menu* Menu::_instance = NULL;
3737
3838 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+
3944 if (!_instance) {
4045 qDebug("First call to Menu::getInstance() - initing menu.\n");
4146
4247 _instance = new Menu();
4348 }
49+
50+ menuInstanceMutex.unlock();
4451
4552 return _instance;
4653 }
@@ -477,8 +484,10 @@ Menu::Menu() : · 430 unmodified lines
477484 addCheckableActionToQMenuAndActionHash(renderDebugMenu, MenuOption::CoverageMapV2, Qt::SHIFT | Qt::CTRL | Qt::Key_P);
478485
479486 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+
482491 addCheckableActionToQMenuAndActionHash(developerMenu, MenuOption::ExtraDebugging);
483492 addActionToQMenuAndActionHash(developerMenu, MenuOption::PasteToVoxel,
484493 Qt::CTRL | Qt::SHIFT | Qt::Key_V,

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t