History

No updater command line argument

Atlante45 committed 9 years ago

Commit aa1d9011 parent e5398401 file · +6 −5Browse files

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

Unified · Split

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