Showing the changes to interface/src/Application.cpp (1 of 83 files). Show all
Unified · Split
| @@ -431,7 +431,7 @@ static const QString STATE_ADVANCED_MOVEMENT_CONTROLS = "AdvancedMovement"; · 430 unmodified lines | ||
| 431 | 431 | static const QString STATE_GROUNDED = "Grounded"; |
| 432 | 432 | static const QString STATE_NAV_FOCUSED = "NavigationFocused"; |
| 433 | 433 | |
| 434 | −bool setupEssentials(int& argc, char** argv) { | |
| 434 | +bool setupEssentials(int& argc, char** argv, bool runningMarkerExisted) { | |
| 435 | 435 | const char** constArgv = const_cast<const char**>(argv); |
| 436 | 436 | const char* portStr = getCmdOption(argc, constArgv, "--listenPort"); |
| 437 | 437 | const int listenPort = portStr ? atoi(portStr) : INVALID_PORT; |
| @@ -458,7 +458,7 @@ bool setupEssentials(int& argc, char** argv) { · 20 unmodified lines | ||
| 458 | 458 | |
| 459 | 459 | static const auto SUPPRESS_SETTINGS_RESET = "--suppress-settings-reset"; |
| 460 | 460 | bool suppressPrompt = cmdOptionExists(argc, const_cast<const char**>(argv), SUPPRESS_SETTINGS_RESET); |
| 461 | − bool previousSessionCrashed = CrashHandler::checkForResetSettings(suppressPrompt); | |
| 461 | + bool previousSessionCrashed = CrashHandler::checkForResetSettings(runningMarkerExisted, suppressPrompt); | |
| 462 | 462 | |
| 463 | 463 | DependencyManager::registerInheritance<LimitedNodeList, NodeList>(); |
| 464 | 464 | DependencyManager::registerInheritance<AvatarHashMap, AvatarManager>(); |
| @@ -563,11 +563,11 @@ const bool DEFAULT_DESKTOP_TABLET_BECOMES_TOOLBAR = true; · 98 unmodified lines | ||
| 563 | 563 | const bool DEFAULT_HMD_TABLET_BECOMES_TOOLBAR = false; |
| 564 | 564 | const bool DEFAULT_PREFER_AVATAR_FINGER_OVER_STYLUS = false; |
| 565 | 565 | |
| 566 | −Application::Application(int& argc, char** argv, QElapsedTimer& startupTimer) : | |
| 566 | +Application::Application(int& argc, char** argv, QElapsedTimer& startupTimer, bool runningMarkerExisted) : | |
| 567 | 567 | QApplication(argc, argv), |
| 568 | 568 | _window(new MainWindow(desktop())), |
| 569 | 569 | _sessionRunTimer(startupTimer), |
| 570 | − _previousSessionCrashed(setupEssentials(argc, argv)), | |
| 570 | + _previousSessionCrashed(setupEssentials(argc, argv, runningMarkerExisted)), | |
| 571 | 571 | _undoStackScriptingInterface(&_undoStack), |
| 572 | 572 | _entitySimulation(new PhysicalEntitySimulation()), |
| 573 | 573 | _physicsEngine(new PhysicsEngine(Vectors::ZERO)), |
| @@ -3972,7 +3972,7 @@ void Application::updateMyAvatarLookAtPosition() { · 3398 unmodified lines | ||
| 3972 | 3972 | if (faceAngle < MAXIMUM_FACE_ANGLE) { |
| 3973 | 3973 | // Randomly look back and forth between look targets |
| 3974 | 3974 | eyeContactTarget target = Menu::getInstance()->isOptionChecked(MenuOption::FixGaze) ? |
| 3975 | − LEFT_EYE : myAvatar->getEyeContactTarget(); | |
| 3975 | + LEFT_EYE : myAvatar->getEyeContactTarget(); | |
| 3976 | 3976 | switch (target) { |
| 3977 | 3977 | case LEFT_EYE: |
| 3978 | 3978 | lookAtSpot = lookingAtHead->getLeftEyePosition(); |
| @@ -6425,7 +6425,7 @@ void Application::takeSnapshot(bool notify, bool includeAnimated, float aspectRa · 2446 unmodified lines | ||
| 6425 | 6425 | if (!includeAnimated) { |
| 6426 | 6426 | // Tell the dependency manager that the capture of the still snapshot has taken place. |
| 6427 | 6427 | emit DependencyManager::get<WindowScriptingInterface>()->stillSnapshotTaken(path, notify); |
| 6428 | − } else { | |
| 6428 | + } else if (!SnapshotAnimated::isAlreadyTakingSnapshotAnimated()) { | |
| 6429 | 6429 | // Get an animated GIF snapshot and save it |
| 6430 | 6430 | SnapshotAnimated::saveSnapshotAnimated(path, aspectRatio, qApp, DependencyManager::get<WindowScriptingInterface>()); |
| 6431 | 6431 | } |