History

Merge remote-tracking branch 'upstream/master' into plugins

Brad Davis committed 11 years ago

Commit a923c042 parents dcdf47d 62b3ca911 files · +60 −32Browse files

Showing the changes to interface/src/Application.cpp (1 of 11 files). Show all

Unified · Split

interface/src/Application.cpp+5−0
@@ -633,6 +633,11 @@ Application::Application(int& argc, char** argv, QElapsedTimer &startup_time) : · 632 unmodified lines
633633 _settingsTimer.setSingleShot(false);
634634 _settingsTimer.setInterval(SAVE_SETTINGS_INTERVAL);
635635 _settingsThread.start();
636+
637+ if (Menu::getInstance()->isOptionChecked(MenuOption::IndependentMode)) {
638+ Menu::getInstance()->setIsOptionChecked(MenuOption::ThirdPerson, true);
639+ cameraMenuChanged();
640+ }
636641
637642 _trayIcon->show();
638643