having stats mirror master

This commit is contained in:
Wayne Chen 2018-12-11 19:29:17 -08:00
parent 4b8200d5bb
commit dbebf1a67f
3 changed files with 1 additions and 4 deletions

View file

@ -5196,7 +5196,6 @@ void Application::pauseUntilLoginDetermined() {
menu->getMenu("Navigate")->setVisible(false);
menu->getMenu("Settings")->setVisible(false);
_developerMenuVisible = menu->getMenu("Developer")->isVisible();
_showStatsEnabled = menu->isOptionChecked(MenuOption::Stats);
menu->setIsOptionChecked(MenuOption::Stats, false);
if (_developerMenuVisible) {
menu->getMenu("Developer")->setVisible(false);
@ -5285,7 +5284,6 @@ void Application::resumeAfterLoginDialogActionTaken() {
menu->getMenu("Navigate")->setVisible(true);
menu->getMenu("Settings")->setVisible(true);
menu->getMenu("Developer")->setVisible(_developerMenuVisible);
menu->setIsOptionChecked(MenuOption::Stats, _showStatsEnabled);
_myCamera.setMode(_previousCameraMode);
cameraModeChanged();
}

View file

@ -688,7 +688,6 @@ private:
int _maxOctreePPS = DEFAULT_MAX_OCTREE_PPS;
bool _interstitialModeEnabled{ false };
bool _showStatsEnabled{ false };
bool _loginDialogPoppedUp = false;
// if visible before login popped up.

View file

@ -806,7 +806,7 @@ Menu::Menu() {
connect(action, &QAction::triggered, qApp, []() { std::thread(crash::newFault).join(); });
// Developer > Show Statistics
addCheckableActionToQMenuAndActionHash(developerMenu, MenuOption::Stats);
addCheckableActionToQMenuAndActionHash(developerMenu, MenuOption::Stats, 0, true);
// Developer > Show Animation Statistics
addCheckableActionToQMenuAndActionHash(developerMenu, MenuOption::AnimStats);