History

trying to fix dependency shutdown

SamGondelman committed 8 years ago

Commit 79548651 parent 01c4b5716 files · +159 −190Browse files

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

Unified · Split

interface/src/Menu.cpp+4−8
@@ -692,10 +692,9 @@ Menu::Menu() { · 691 unmodified lines
692 692
693 action = addActionToQMenuAndActionHash(audioDebugMenu, "Stats...");693 action = addActionToQMenuAndActionHash(audioDebugMenu, "Stats...");
694 connect(action, &QAction::triggered, [] {694 connect(action, &QAction::triggered, [] {
695 auto scriptEngines = DependencyManager::get<ScriptEngines>();
696 QUrl defaultScriptsLoc = PathUtils::defaultScriptsLocation();695 QUrl defaultScriptsLoc = PathUtils::defaultScriptsLocation();
697 defaultScriptsLoc.setPath(defaultScriptsLoc.path() + "developer/utilities/audio/stats.js");696 defaultScriptsLoc.setPath(defaultScriptsLoc.path() + "developer/utilities/audio/stats.js");
698 scriptEngines->loadScript(defaultScriptsLoc.toString());697 DependencyManager::get<ScriptEngines>()->loadScript(defaultScriptsLoc.toString());
699 });698 });
700 699
701 action = addActionToQMenuAndActionHash(audioDebugMenu, "Buffers...");700 action = addActionToQMenuAndActionHash(audioDebugMenu, "Buffers...");
@@ -704,16 +703,14 @@ Menu::Menu() { · 2 unmodified lines
704 QString("hifi/tablet/TabletAudioBuffers.qml"), "AudioBuffersDialog");703 QString("hifi/tablet/TabletAudioBuffers.qml"), "AudioBuffersDialog");
705 });704 });
706 705
707 auto audioIO = DependencyManager::get<AudioClient>();
708 addActionToQMenuAndActionHash(audioDebugMenu, MenuOption::MuteEnvironment, 0,706 addActionToQMenuAndActionHash(audioDebugMenu, MenuOption::MuteEnvironment, 0,
709 audioIO.data(), SLOT(sendMuteEnvironmentPacket()));707 DependencyManager::get<AudioClient>().data(), SLOT(sendMuteEnvironmentPacket()));
710 708
711 action = addActionToQMenuAndActionHash(audioDebugMenu, MenuOption::AudioScope);709 action = addActionToQMenuAndActionHash(audioDebugMenu, MenuOption::AudioScope);
712 connect(action, &QAction::triggered, [] {710 connect(action, &QAction::triggered, [] {
713 auto scriptEngines = DependencyManager::get<ScriptEngines>();
714 QUrl defaultScriptsLoc = PathUtils::defaultScriptsLocation();711 QUrl defaultScriptsLoc = PathUtils::defaultScriptsLocation();
715 defaultScriptsLoc.setPath(defaultScriptsLoc.path() + "developer/utilities/audio/audioScope.js");712 defaultScriptsLoc.setPath(defaultScriptsLoc.path() + "developer/utilities/audio/audioScope.js");
716 scriptEngines->loadScript(defaultScriptsLoc.toString());713 DependencyManager::get<ScriptEngines>()->loadScript(defaultScriptsLoc.toString());
717 });714 });
718 715
719 // Developer > Physics >>>716 // Developer > Physics >>>
@@ -793,10 +790,9 @@ Menu::Menu() { · 73 unmodified lines
793 // Developer > API Debugger790 // Developer > API Debugger
794 action = addActionToQMenuAndActionHash(developerMenu, "API Debugger");791 action = addActionToQMenuAndActionHash(developerMenu, "API Debugger");
795 connect(action, &QAction::triggered, [] {792 connect(action, &QAction::triggered, [] {
796 auto scriptEngines = DependencyManager::get<ScriptEngines>();
797 QUrl defaultScriptsLoc = PathUtils::defaultScriptsLocation();793 QUrl defaultScriptsLoc = PathUtils::defaultScriptsLocation();
798 defaultScriptsLoc.setPath(defaultScriptsLoc.path() + "developer/utilities/tools/currentAPI.js");794 defaultScriptsLoc.setPath(defaultScriptsLoc.path() + "developer/utilities/tools/currentAPI.js");
799 scriptEngines->loadScript(defaultScriptsLoc.toString());795 DependencyManager::get<ScriptEngines>()->loadScript(defaultScriptsLoc.toString());
800 });796 });
801 797
802 // Developer > Log...798 // Developer > Log...