aboutsummaryrefslogtreecommitdiff
path: root/launcher/modplatform/flame
diff options
context:
space:
mode:
authorTrial97 <alexandru.tripon97@gmail.com>2023-07-27 00:07:38 +0300
committerTrial97 <alexandru.tripon97@gmail.com>2023-07-27 00:07:38 +0300
commit62aa7a52c4f10848b5645b57332afd26421a1f4e (patch)
tree42d24fd534dec552356f998c8dd0f53086fee45b /launcher/modplatform/flame
parent3c472fd7e0cbe517c63f41f8c02767e372e916a1 (diff)
downloadPrismLauncher-62aa7a52c4f10848b5645b57332afd26421a1f4e.tar.gz
PrismLauncher-62aa7a52c4f10848b5645b57332afd26421a1f4e.tar.bz2
PrismLauncher-62aa7a52c4f10848b5645b57332afd26421a1f4e.zip
fiexed conflicts
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
Diffstat (limited to 'launcher/modplatform/flame')
-rw-r--r--launcher/modplatform/flame/FlamePackExportTask.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/launcher/modplatform/flame/FlamePackExportTask.cpp b/launcher/modplatform/flame/FlamePackExportTask.cpp
index 139c9d95..f5f3af37 100644
--- a/launcher/modplatform/flame/FlamePackExportTask.cpp
+++ b/launcher/modplatform/flame/FlamePackExportTask.cpp
@@ -350,7 +350,7 @@ void FlamePackExportTask::buildZip()
stepProgress(*progressStep);
emitFailed(reason);
});
- connect(zipTask.get(), &Task::stepProgress, this, &FlamePackExportTask::propogateStepProgress);
+ connect(zipTask.get(), &Task::stepProgress, this, &FlamePackExportTask::propagateStepProgress);
connect(zipTask.get(), &Task::progress, this, [this, progressStep](qint64 current, qint64 total) {
progressStep->update(current, total);