Don't enter settings after update
This commit is contained in:
parent
ef2a0bb05e
commit
f881192dd0
|
@ -43,6 +43,9 @@ bool Launcher::launchUpdater(UpdaterLaunch action) {
|
||||||
}
|
}
|
||||||
|
|
||||||
const auto justRelaunch = action == UpdaterLaunch::JustRelaunch;
|
const auto justRelaunch = action == UpdaterLaunch::JustRelaunch;
|
||||||
|
if (action == UpdaterLaunch::PerformUpdate) {
|
||||||
|
_updating = true;
|
||||||
|
}
|
||||||
|
|
||||||
std::vector<std::string> argumentsList;
|
std::vector<std::string> argumentsList;
|
||||||
|
|
||||||
|
@ -82,8 +85,10 @@ bool Launcher::launchUpdater(UpdaterLaunch action) {
|
||||||
argumentsList.push_back("-key");
|
argumentsList.push_back("-key");
|
||||||
argumentsList.push_back(cDataFile().toStdString());
|
argumentsList.push_back(cDataFile().toStdString());
|
||||||
}
|
}
|
||||||
argumentsList.push_back("-noupdate");
|
if (!_updating) {
|
||||||
argumentsList.push_back("-tosettings");
|
argumentsList.push_back("-noupdate");
|
||||||
|
argumentsList.push_back("-tosettings");
|
||||||
|
}
|
||||||
if (customWorkingDir()) {
|
if (customWorkingDir()) {
|
||||||
argumentsList.push_back("-workdir");
|
argumentsList.push_back("-workdir");
|
||||||
argumentsList.push_back(cWorkingDir().toStdString());
|
argumentsList.push_back(cWorkingDir().toStdString());
|
||||||
|
|
|
@ -21,6 +21,8 @@ private:
|
||||||
void initHook() override;
|
void initHook() override;
|
||||||
bool launchUpdater(UpdaterLaunch action) override;
|
bool launchUpdater(UpdaterLaunch action) override;
|
||||||
|
|
||||||
|
bool _updating = false;
|
||||||
|
|
||||||
};
|
};
|
||||||
|
|
||||||
} // namespace Platform
|
} // namespace Platform
|
||||||
|
|
Loading…
Reference in New Issue
Block a user