Mirrors/overte-HifiExperiments
3
0
Fork 0
mirror of https://github.com/HifiExperiments/overte.git synced 2025-06-01 10:40:45 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Remove unneeded if checks for INITIAL_STARTUP_LOCATION assignment.

Browse source
This commit is contained in:
Kalila L 2020-08-23 01:52:53 -04:00
parent a2bd06993f
commit feac9683c4
1 changed files with 4 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
interface/src/Menu.cpp
View file

@ -23,7 +23,6 @@
#include <AddressManager.h> #include <AddressManager.h>
#include <AudioClient.h> #include <AudioClient.h>
#include <BuildInfo.h>
#include <CrashHelpers.h> #include <CrashHelpers.h>
#include <DependencyManager.h> #include <DependencyManager.h>
#include <ui/TabletScriptingInterface.h> #include <ui/TabletScriptingInterface.h>
@ -235,17 +234,10 @@ Menu::Menu() {
MenuWrapper* startupLocationMenu = navigateMenu->addMenu(MenuOption::StartUpLocation); MenuWrapper* startupLocationMenu = navigateMenu->addMenu(MenuOption::StartUpLocation);
QActionGroup* startupLocationGroup = new QActionGroup(startupLocationMenu); QActionGroup* startupLocationGroup = new QActionGroup(startupLocationMenu);
startupLocationGroup->setExclusive(true); startupLocationGroup->setExclusive(true);
if (!BuildInfo::INITIAL_STARTUP_LOCATION.isEmpty()) { startupLocationGroup->addAction(addCheckableActionToQMenuAndActionHash(startupLocationMenu, MenuOption::HomeLocation, 0,
startupLocationGroup->addAction(addCheckableActionToQMenuAndActionHash(startupLocationMenu, MenuOption::HomeLocation, 0, false));
true)); startupLocationGroup->addAction(addCheckableActionToQMenuAndActionHash(startupLocationMenu, MenuOption::LastLocation, 0,
startupLocationGroup->addAction(addCheckableActionToQMenuAndActionHash(startupLocationMenu, MenuOption::LastLocation, 0, true));
false));
} else {
startupLocationGroup->addAction(addCheckableActionToQMenuAndActionHash(startupLocationMenu, MenuOption::HomeLocation, 0,
false));
startupLocationGroup->addAction(addCheckableActionToQMenuAndActionHash(startupLocationMenu, MenuOption::LastLocation, 0,
true));
}
// Settings menu ---------------------------------- // Settings menu ----------------------------------
MenuWrapper* settingsMenu = addMenu("Settings"); MenuWrapper* settingsMenu = addMenu("Settings");