aboutsummaryrefslogtreecommitdiff
path: root/launcher/minecraft/mod/tasks/LocalModParseTask.cpp
diff options
context:
space:
mode:
authorflow <flowlnlnln@gmail.com>2022-09-07 08:30:36 -0300
committerGitHub <noreply@github.com>2022-09-07 08:30:36 -0300
commit333dbca01ed15103b5a36a58a9faad7464ed1582 (patch)
tree744421e688d8772a9be967de4c3c6fe1cd5230cf /launcher/minecraft/mod/tasks/LocalModParseTask.cpp
parent1b0ca476824ad3d704de70720184d2f1e194d2f5 (diff)
parentbedd3c50b6d3c399ccb243c9ea1a62d9b786389f (diff)
downloadPrismLauncher-333dbca01ed15103b5a36a58a9faad7464ed1582.tar.gz
PrismLauncher-333dbca01ed15103b5a36a58a9faad7464ed1582.tar.bz2
PrismLauncher-333dbca01ed15103b5a36a58a9faad7464ed1582.zip
Merge pull request #1105 from flowln/better_resource_packs
Add basic resource pack parsing and fix issues
Diffstat (limited to 'launcher/minecraft/mod/tasks/LocalModParseTask.cpp')
-rw-r--r--launcher/minecraft/mod/tasks/LocalModParseTask.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/launcher/minecraft/mod/tasks/LocalModParseTask.cpp b/launcher/minecraft/mod/tasks/LocalModParseTask.cpp
index c486bd46..8a6e54d8 100644
--- a/launcher/minecraft/mod/tasks/LocalModParseTask.cpp
+++ b/launcher/minecraft/mod/tasks/LocalModParseTask.cpp
@@ -499,7 +499,7 @@ void LocalModParseTask::processAsLitemod()
bool LocalModParseTask::abort()
{
- m_aborted = true;
+ m_aborted.store(true);
return true;
}
@@ -521,7 +521,7 @@ void LocalModParseTask::executeTask()
}
if (m_aborted)
- emitAborted();
+ emit finished();
else
emitSucceeded();
}