aboutsummaryrefslogtreecommitdiff
path: root/api
diff options
context:
space:
mode:
authorPetr Mrázek <peterix@gmail.com>2021-03-10 03:57:36 +0100
committerPetr Mrázek <peterix@gmail.com>2021-03-10 03:58:24 +0100
commit84c673c5ba6178afda85dbc9a4a83d9e5fcf5d47 (patch)
tree416474c38346e603fd07d6942e09c6c241eb1058 /api
parent0c98589a7f9115075f2c51f5ad134dce3d244aba (diff)
downloadPrismLauncher-84c673c5ba6178afda85dbc9a4a83d9e5fcf5d47.tar.gz
PrismLauncher-84c673c5ba6178afda85dbc9a4a83d9e5fcf5d47.tar.bz2
PrismLauncher-84c673c5ba6178afda85dbc9a4a83d9e5fcf5d47.zip
GH-3467 fix stall-out in ScanModFolders when the folders don't exist
Diffstat (limited to 'api')
-rw-r--r--api/logic/minecraft/launch/ScanModFolders.cpp9
1 files changed, 7 insertions, 2 deletions
diff --git a/api/logic/minecraft/launch/ScanModFolders.cpp b/api/logic/minecraft/launch/ScanModFolders.cpp
index f792efcd..2a0e21b3 100644
--- a/api/logic/minecraft/launch/ScanModFolders.cpp
+++ b/api/logic/minecraft/launch/ScanModFolders.cpp
@@ -27,11 +27,16 @@ void ScanModFolders::executeTask()
auto loaders = m_inst->loaderModList();
connect(loaders.get(), &ModFolderModel::updateFinished, this, &ScanModFolders::modsDone);
- loaders->update();
+ if(!loaders->update()) {
+ m_modsDone = true;
+ }
auto cores = m_inst->coreModList();
connect(cores.get(), &ModFolderModel::updateFinished, this, &ScanModFolders::coreModsDone);
- cores->update();
+ if(!cores->update()) {
+ m_coreModsDone = true;
+ }
+ checkDone();
}
void ScanModFolders::modsDone()