History

Remove unneeded if checks for INITIAL_STARTUP_LOCATION assignment.

Kalila L committed 6 years ago

Commit feac9681 parent a2bd0691 file · +4 −12Browse files

Showing the changes to interface/src/Menu.cpp (1 of 1 file). Show all

Unified · Split

interface/src/Menu.cpp+4−12
@@ -23,7 +23,6 @@ · 22 unmodified lines
2323
2424 #include <AddressManager.h>
2525 #include <AudioClient.h>
26−#include <BuildInfo.h>
2726 #include <CrashHelpers.h>
2827 #include <DependencyManager.h>
2928 #include <ui/TabletScriptingInterface.h>
@@ -235,17 +234,10 @@ Menu::Menu() { · 205 unmodified lines
235234 MenuWrapper* startupLocationMenu = navigateMenu->addMenu(MenuOption::StartUpLocation);
236235 QActionGroup* startupLocationGroup = new QActionGroup(startupLocationMenu);
237236 startupLocationGroup->setExclusive(true);
238− if (!BuildInfo::INITIAL_STARTUP_LOCATION.isEmpty()) {
239− startupLocationGroup->addAction(addCheckableActionToQMenuAndActionHash(startupLocationMenu, MenuOption::HomeLocation, 0,
240− true));
241− startupLocationGroup->addAction(addCheckableActionToQMenuAndActionHash(startupLocationMenu, MenuOption::LastLocation, 0,
242− false));
243− } else {
244− startupLocationGroup->addAction(addCheckableActionToQMenuAndActionHash(startupLocationMenu, MenuOption::HomeLocation, 0,
245− false));
246− startupLocationGroup->addAction(addCheckableActionToQMenuAndActionHash(startupLocationMenu, MenuOption::LastLocation, 0,
247− true));
248− }
237+ startupLocationGroup->addAction(addCheckableActionToQMenuAndActionHash(startupLocationMenu, MenuOption::HomeLocation, 0,
238+ false));
239+ startupLocationGroup->addAction(addCheckableActionToQMenuAndActionHash(startupLocationMenu, MenuOption::LastLocation, 0,
240+ true));
249241
250242 // Settings menu ----------------------------------
251243 MenuWrapper* settingsMenu = addMenu("Settings");

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t