diff --git a/interface/src/Application.cpp b/interface/src/Application.cpp index e5ede56094..6bb934b5bf 100644 --- a/interface/src/Application.cpp +++ b/interface/src/Application.cpp @@ -1443,7 +1443,6 @@ Application::Application(int& argc, char** argv, QElapsedTimer& startupTimer, bo connect(audioIO.data(), &AudioClient::noiseGateClosed, audioScriptingInterface.data(), &AudioScriptingInterface::noiseGateClosed); connect(audioIO.data(), &AudioClient::inputReceived, audioScriptingInterface.data(), &AudioScriptingInterface::inputReceived); - this->installEventFilter(this); #ifdef HAVE_DDE @@ -1467,8 +1466,7 @@ Application::Application(int& argc, char** argv, QElapsedTimer& startupTimer, bo applicationUpdater->checkForUpdate(); } - // Now that menu is initialized we can sync myAvatar with it's state. - myAvatar->updateMotionBehaviorFromMenu(); + Menu::getInstance()->setIsOptionChecked(MenuOption::ActionMotorControl, true); // FIXME spacemouse code still needs cleanup #if 0 diff --git a/interface/src/Menu.cpp b/interface/src/Menu.cpp index eeda9e9036..3f168f28ea 100644 --- a/interface/src/Menu.cpp +++ b/interface/src/Menu.cpp @@ -589,8 +589,8 @@ Menu::Menu() { addCheckableActionToQMenuAndActionHash(avatarDebugMenu, MenuOption::RenderDetailedCollision, 0, false, avatar.get(), SLOT(setEnableDebugDrawDetailedCollision(bool))); - addCheckableActionToQMenuAndActionHash(avatarDebugMenu, MenuOption::ActionMotorControl, - Qt::CTRL | Qt::SHIFT | Qt::Key_K, true, avatar.get(), SLOT(updateMotionBehaviorFromMenu()), + addCheckableActionToQMenuAndActionHash(avatarDebugMenu, MenuOption::ActionMotorControl, 0, true, + avatar.get(), SLOT(updateMotionBehaviorFromMenu()), UNSPECIFIED_POSITION, "Developer"); addCheckableActionToQMenuAndActionHash(avatarDebugMenu, MenuOption::ScriptedMotorControl, 0, true,