From 4b8200d5bb6bffe8c45406a6223b9ad30ff97d87 Mon Sep 17 00:00:00 2001 From: Wayne Chen Date: Tue, 11 Dec 2018 17:27:54 -0800 Subject: [PATCH] forcing stats to be false until login determined --- interface/src/Application.cpp | 7 ++++--- interface/src/Application.h | 1 + 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/interface/src/Application.cpp b/interface/src/Application.cpp index c4bfef2dd6..116f83f26c 100644 --- a/interface/src/Application.cpp +++ b/interface/src/Application.cpp @@ -5196,6 +5196,8 @@ 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); } @@ -5282,9 +5284,8 @@ void Application::resumeAfterLoginDialogActionTaken() { menu->getMenu("View")->setVisible(true); menu->getMenu("Navigate")->setVisible(true); menu->getMenu("Settings")->setVisible(true); - if (_developerMenuVisible) { - menu->getMenu("Developer")->setVisible(true); - } + menu->getMenu("Developer")->setVisible(_developerMenuVisible); + menu->setIsOptionChecked(MenuOption::Stats, _showStatsEnabled); _myCamera.setMode(_previousCameraMode); cameraModeChanged(); } diff --git a/interface/src/Application.h b/interface/src/Application.h index a3bbb2b83f..15eb3cfe46 100644 --- a/interface/src/Application.h +++ b/interface/src/Application.h @@ -688,6 +688,7 @@ private: int _maxOctreePPS = DEFAULT_MAX_OCTREE_PPS; bool _interstitialModeEnabled{ false }; + bool _showStatsEnabled{ false }; bool _loginDialogPoppedUp = false; // if visible before login popped up.