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
692692
693693 action = addActionToQMenuAndActionHash(audioDebugMenu, "Stats...");
694694 connect(action, &QAction::triggered, [] {
695− auto scriptEngines = DependencyManager::get<ScriptEngines>();
696695 QUrl defaultScriptsLoc = PathUtils::defaultScriptsLocation();
697696 defaultScriptsLoc.setPath(defaultScriptsLoc.path() + "developer/utilities/audio/stats.js");
698− scriptEngines->loadScript(defaultScriptsLoc.toString());
697+ DependencyManager::get<ScriptEngines>()->loadScript(defaultScriptsLoc.toString());
699698 });
700699
701700 action = addActionToQMenuAndActionHash(audioDebugMenu, "Buffers...");
@@ -704,16 +703,14 @@ Menu::Menu() { · 2 unmodified lines
704703 QString("hifi/tablet/TabletAudioBuffers.qml"), "AudioBuffersDialog");
705704 });
706705
707− auto audioIO = DependencyManager::get<AudioClient>();
708706 addActionToQMenuAndActionHash(audioDebugMenu, MenuOption::MuteEnvironment, 0,
709− audioIO.data(), SLOT(sendMuteEnvironmentPacket()));
707+ DependencyManager::get<AudioClient>().data(), SLOT(sendMuteEnvironmentPacket()));
710708
711709 action = addActionToQMenuAndActionHash(audioDebugMenu, MenuOption::AudioScope);
712710 connect(action, &QAction::triggered, [] {
713− auto scriptEngines = DependencyManager::get<ScriptEngines>();
714711 QUrl defaultScriptsLoc = PathUtils::defaultScriptsLocation();
715712 defaultScriptsLoc.setPath(defaultScriptsLoc.path() + "developer/utilities/audio/audioScope.js");
716− scriptEngines->loadScript(defaultScriptsLoc.toString());
713+ DependencyManager::get<ScriptEngines>()->loadScript(defaultScriptsLoc.toString());
717714 });
718715
719716 // Developer > Physics >>>
@@ -793,10 +790,9 @@ Menu::Menu() { · 73 unmodified lines
793790 // Developer > API Debugger
794791 action = addActionToQMenuAndActionHash(developerMenu, "API Debugger");
795792 connect(action, &QAction::triggered, [] {
796− auto scriptEngines = DependencyManager::get<ScriptEngines>();
797793 QUrl defaultScriptsLoc = PathUtils::defaultScriptsLocation();
798794 defaultScriptsLoc.setPath(defaultScriptsLoc.path() + "developer/utilities/tools/currentAPI.js");
799− scriptEngines->loadScript(defaultScriptsLoc.toString());
795+ DependencyManager::get<ScriptEngines>()->loadScript(defaultScriptsLoc.toString());
800796 });
801797
802798 // Developer > Log...