redstrate/astra
1
Fork 0
mirror of https://github.com/redstrate/Astra.git synced 2025-04-23 04:57:44 +00:00
Code Activity

Stop update progress dialog from appearing randomly

Browse source 
This also removes the extraneous boolean required for this.
This commit is contained in:
Joshua Goins 2022-03-14 13:19:36 -04:00
parent e708eda1e8
commit 8e86ed8e8d
2 changed files with 4 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
include/assetupdater.h
View file

@ -49,6 +49,4 @@ private:
QJsonArray remoteDalamudAssetArray;
QString dataDir;
bool wantsCancel = false;
};

15
src/assetupdater.cpp
View file

@ -33,12 +33,6 @@ const QString dotnetDesktopPackageURL =
AssetUpdater::AssetUpdater(LauncherCore& launcher) : launcher(launcher) {
launcher.mgr->setRedirectPolicy(QNetworkRequest::NoLessSafeRedirectPolicy);
dialog = new QProgressDialog("Updating assets...", "Cancel", 0, 0);
connect(dialog, &QProgressDialog::canceled, [this] {
wantsCancel = true;
});
dataDir =
QStandardPaths::writableLocation(QStandardPaths::AppDataLocation);
}
@ -50,8 +44,7 @@ void AssetUpdater::update(const ProfileSettings& profile) {
return;
}
wantsCancel = false;
dialog->show();
dialog = new QProgressDialog("Updating assets...", "Cancel", 0, 0);
// first, we want to collect all of the remote versions
@ -178,7 +171,7 @@ void AssetUpdater::beginInstall() {
}
void AssetUpdater::checkIfDalamudAssetsDone() {
if(wantsCancel)
if(dialog->wasCanceled())
return;
if(dalamudAssetNeededFilenames.empty()) {
@ -196,7 +189,7 @@ void AssetUpdater::checkIfDalamudAssetsDone() {
}
void AssetUpdater::checkIfFinished() {
if(wantsCancel)
if(dialog->wasCanceled())
return;
if (doneDownloadingDalamud &&
@ -216,7 +209,7 @@ void AssetUpdater::checkIfFinished() {
}
void AssetUpdater::checkIfCheckingIsDone() {
if(wantsCancel)
if(dialog->wasCanceled())
return;
if(remoteDalamudVersion.isEmpty() || remoteRuntimeVersion.isEmpty() || remoteDalamudAssetVersion == -1) {