diff --git a/interface/src/Application.cpp b/interface/src/Application.cpp index 14de83ec4a..8d7c25a675 100644 --- a/interface/src/Application.cpp +++ b/interface/src/Application.cpp @@ -723,6 +723,10 @@ void Application::paintGL() { _frameCount++; } +void Application::runTests() { + runTimingTests(); +} + void Application::resetCamerasOnResizeGL(Camera& camera, int width, int height) { if (OculusManager::isConnected()) { OculusManager::configureCamera(camera, width, height); diff --git a/interface/src/Application.h b/interface/src/Application.h index 87ac72e604..b48d67fe12 100644 --- a/interface/src/Application.h +++ b/interface/src/Application.h @@ -398,6 +398,8 @@ private slots: void parseVersionXml(); void manageRunningScriptsWidgetVisibility(bool shown); + + void runTests(); private: void resetCamerasOnResizeGL(Camera& camera, int width, int height); diff --git a/interface/src/Menu.cpp b/interface/src/Menu.cpp index 6b4a855c69..9ef736105a 100644 --- a/interface/src/Menu.cpp +++ b/interface/src/Menu.cpp @@ -470,7 +470,7 @@ Menu::Menu() { addCheckableActionToQMenuAndActionHash(timingMenu, MenuOption::TestPing, 0, true); addCheckableActionToQMenuAndActionHash(timingMenu, MenuOption::FrameTimer); - addActionToQMenuAndActionHash(timingMenu, MenuOption::RunTimingTests, 0, this, SLOT(runTests())); + addActionToQMenuAndActionHash(timingMenu, MenuOption::RunTimingTests, 0, qApp, SLOT(runTests())); addCheckableActionToQMenuAndActionHash(timingMenu, MenuOption::PipelineWarnings); addCheckableActionToQMenuAndActionHash(timingMenu, MenuOption::SuppressShortTimings); @@ -599,9 +599,6 @@ void Menu::loadSettings(QSettings* settings) { Application::getInstance()->getAvatar()->loadData(settings); Application::getInstance()->updateWindowTitle(); - // notify that a settings has changed - connect(&DependencyManager::get()->getDomainHandler(), &DomainHandler::hostnameChanged, this, &Menu::bumpSettings); - // MyAvatar caches some menu options, so we have to update them whenever we load settings. // TODO: cache more settings in MyAvatar that are checked with very high frequency. setIsOptionChecked(MenuOption::KeyboardMotorControl , true); @@ -800,7 +797,6 @@ QAction* Menu::addCheckableActionToQMenuAndActionHash(QMenu* destinationMenu, QAction::NoRole, menuItemLocation); action->setCheckable(true); action->setChecked(checked); - connect(action, SIGNAL(changed()), this, SLOT(bumpSettings())); return action; } @@ -1076,11 +1072,3 @@ void Menu::showEditEntitiesHelp() { InfoView::forcedShow(INFO_EDIT_ENTITIES_PATH); } -void Menu::bumpSettings() { - Application::getInstance()->bumpSettings(); -} - -void Menu::runTests() { - runTimingTests(); -} - diff --git a/interface/src/Menu.h b/interface/src/Menu.h index bfd69f1de2..6eb74f2984 100644 --- a/interface/src/Menu.h +++ b/interface/src/Menu.h @@ -132,8 +132,6 @@ private: private slots: void aboutApp(); void showEditEntitiesHelp(); - void bumpSettings(); - void runTests(); }; namespace MenuOption {