Merge branch 'develop' into feat/acknowledge_release_type

Signed-off-by: Alexandru Ionut Tripon <alexandru.tripon97@gmail.com>

1 files changed, 6 insertions, 11 deletions

diff --git a/launcher/minecraft/MinecraftLoadAndCheck.cpp b/launcher/minecraft/MinecraftLoadAndCheck.cpp
index 1c3f6fb7..818e90cf 100644
--- a/launcher/minecraft/MinecraftLoadAndCheck.cpp
+++ b/launcher/minecraft/MinecraftLoadAndCheck.cpp
@@ -2,9 +2,7 @@
 #include "MinecraftInstance.h"
 #include "PackProfile.h"
 
-MinecraftLoadAndCheck::MinecraftLoadAndCheck(MinecraftInstance *inst, QObject *parent) : Task(parent), m_inst(inst)
-{
-}
+MinecraftLoadAndCheck::MinecraftLoadAndCheck(MinecraftInstance* inst, QObject* parent) : Task(parent), m_inst(inst) {}
 
 void MinecraftLoadAndCheck::executeTask()
 {
@@ -13,23 +11,21 @@ void MinecraftLoadAndCheck::executeTask()
     components->reload(Net::Mode::Offline);
     m_task = components->getCurrentTask();
 
-    if(!m_task)
-    {
+    if (!m_task) {
         emitSucceeded();
         return;
     }
     connect(m_task.get(), &Task::succeeded, this, &MinecraftLoadAndCheck::subtaskSucceeded);
     connect(m_task.get(), &Task::failed, this, &MinecraftLoadAndCheck::subtaskFailed);
-    connect(m_task.get(), &Task::aborted, this, [this]{ subtaskFailed(tr("Aborted")); });
+    connect(m_task.get(), &Task::aborted, this, [this] { subtaskFailed(tr("Aborted")); });
     connect(m_task.get(), &Task::progress, this, &MinecraftLoadAndCheck::progress);
-    connect(m_task.get(), &Task::stepProgress, this, &MinecraftLoadAndCheck::propogateStepProgress);
+    connect(m_task.get(), &Task::stepProgress, this, &MinecraftLoadAndCheck::propagateStepProgress);
     connect(m_task.get(), &Task::status, this, &MinecraftLoadAndCheck::setStatus);
 }
 
 void MinecraftLoadAndCheck::subtaskSucceeded()
 {
-    if(isFinished())
-    {
+    if (isFinished()) {
         qCritical() << "MinecraftUpdate: Subtask" << sender() << "succeeded, but work was already done!";
         return;
     }
@@ -38,8 +34,7 @@ void MinecraftLoadAndCheck::subtaskSucceeded()
 
 void MinecraftLoadAndCheck::subtaskFailed(QString error)
 {
-    if(isFinished())
-    {
+    if (isFinished()) {
         qCritical() << "MinecraftUpdate: Subtask" << sender() << "failed, but work was already done!";
         return;
     }