Showing the changes to interface/src/Application.cpp (1 of 1 file). Show all
Unified · Split
| @@ -591,8 +591,10 @@ Application::Application(int& argc, char** argv, QElapsedTimer& startupTimer, bo · 590 unmodified lines | ||
| 591 | 591 | qCDebug(interfaceapp) << "[VERSION] We will use DEVELOPMENT global services."; |
| 592 | 592 | #endif |
| 593 | 593 | |
| 594 | − | |
| 595 | − bool wantsSandboxRunning = shouldRunServer(); | |
| 594 | + | |
| 595 | + static const QString NO_UPDATER_ARG = "--no-updater"; | |
| 596 | + static const bool noUpdater = arguments().indexOf(NO_UPDATER_ARG) != -1; | |
| 597 | + static const bool wantsSandboxRunning = shouldRunServer(); | |
| 596 | 598 | static bool determinedSandboxState = false; |
| 597 | 599 | static bool sandboxIsRunning = false; |
| 598 | 600 | SandboxUtils sandboxUtils; |
| @@ -602,11 +604,10 @@ Application::Application(int& argc, char** argv, QElapsedTimer& startupTimer, bo · 3 unmodified lines | ||
| 602 | 604 | qCDebug(interfaceapp) << "Home sandbox appears to be running....."; |
| 603 | 605 | determinedSandboxState = true; |
| 604 | 606 | sandboxIsRunning = true; |
| 605 | − }, [&, wantsSandboxRunning]() { | |
| 607 | + }, [&]() { | |
| 606 | 608 | qCDebug(interfaceapp) << "Home sandbox does not appear to be running...."; |
| 607 | 609 | if (wantsSandboxRunning) { |
| 608 | 610 | QString contentPath = getRunServerPath(); |
| 609 | − bool noUpdater = SteamClient::isRunning(); | |
| 610 | 611 | SandboxUtils::runLocalSandbox(contentPath, true, RUNNING_MARKER_FILENAME, noUpdater); |
| 611 | 612 | sandboxIsRunning = true; |
| 612 | 613 | } |
| @@ -1128,7 +1129,7 @@ Application::Application(int& argc, char** argv, QElapsedTimer& startupTimer, bo · 515 unmodified lines | ||
| 1128 | 1129 | #endif |
| 1129 | 1130 | |
| 1130 | 1131 | // If launched from Steam, let it handle updates |
| 1131 | − if (!SteamClient::isRunning()) { | |
| 1132 | + if (!noUpdater) { | |
| 1132 | 1133 | auto applicationUpdater = DependencyManager::get<AutoUpdater>(); |
| 1133 | 1134 | connect(applicationUpdater.data(), &AutoUpdater::newVersionIsAvailable, dialogsManager.data(), &DialogsManager::showUpdateDialog); |
| 1134 | 1135 | applicationUpdater->checkForUpdate(); |