From 32b3ed0a1362a4b0798ad71fac3450fb77cb7e41 Mon Sep 17 00:00:00 2001
From: Thomas Groman <tgroman@nuegia.net>
Date: Thu, 19 Sep 2019 00:41:48 -0700
Subject: merged from 0.6.7 codebase

---
 api/logic/launch/steps/Update.cpp | 86 +++++++++++++++++++--------------------
 1 file changed, 43 insertions(+), 43 deletions(-)

(limited to 'api/logic/launch/steps/Update.cpp')

diff --git a/api/logic/launch/steps/Update.cpp b/api/logic/launch/steps/Update.cpp
index d057febb..6eb012f7 100644
--- a/api/logic/launch/steps/Update.cpp
+++ b/api/logic/launch/steps/Update.cpp
@@ -1,4 +1,4 @@
-/* Copyright 2013-2018 MultiMC Contributors
+/* Copyright 2013-2019 MultiMC Contributors
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -18,63 +18,63 @@
 
 void Update::executeTask()
 {
-	if(m_aborted)
-	{
-		emitFailed(tr("Task aborted."));
-		return;
-	}
-	m_updateTask.reset(m_parent->instance()->createUpdateTask(m_mode));
-	if(m_updateTask)
-	{
-		connect(m_updateTask.get(), SIGNAL(finished()), this, SLOT(updateFinished()));
-		connect(m_updateTask.get(), &Task::progress, this, &Task::setProgress);
-		connect(m_updateTask.get(), &Task::status, this, &Task::setStatus);
-		emit progressReportingRequest();
-		return;
-	}
-	emitSucceeded();
+    if(m_aborted)
+    {
+        emitFailed(tr("Task aborted."));
+        return;
+    }
+    m_updateTask.reset(m_parent->instance()->createUpdateTask(m_mode));
+    if(m_updateTask)
+    {
+        connect(m_updateTask.get(), SIGNAL(finished()), this, SLOT(updateFinished()));
+        connect(m_updateTask.get(), &Task::progress, this, &Task::setProgress);
+        connect(m_updateTask.get(), &Task::status, this, &Task::setStatus);
+        emit progressReportingRequest();
+        return;
+    }
+    emitSucceeded();
 }
 
 void Update::proceed()
 {
-	m_updateTask->start();
+    m_updateTask->start();
 }
 
 void Update::updateFinished()
 {
-	if(m_updateTask->wasSuccessful())
-	{
-		m_updateTask.reset();
-		emitSucceeded();
-	}
-	else
-	{
-		QString reason = tr("Instance update failed because: %1.\n\n").arg(m_updateTask->failReason());
-		m_updateTask.reset();
-		emit logLine(reason, MessageLevel::Fatal);
-		emitFailed(reason);
-	}
+    if(m_updateTask->wasSuccessful())
+    {
+        m_updateTask.reset();
+        emitSucceeded();
+    }
+    else
+    {
+        QString reason = tr("Instance update failed because: %1\n\n").arg(m_updateTask->failReason());
+        m_updateTask.reset();
+        emit logLine(reason, MessageLevel::Fatal);
+        emitFailed(reason);
+    }
 }
 
 bool Update::canAbort() const
 {
-	if(m_updateTask)
-	{
-		return m_updateTask->canAbort();
-	}
-	return true;
+    if(m_updateTask)
+    {
+        return m_updateTask->canAbort();
+    }
+    return true;
 }
 
 
 bool Update::abort()
 {
-	m_aborted = true;
-	if(m_updateTask)
-	{
-		if(m_updateTask->canAbort())
-		{
-			return m_updateTask->abort();
-		}
-	}
-	return true;
+    m_aborted = true;
+    if(m_updateTask)
+    {
+        if(m_updateTask->canAbort())
+        {
+            return m_updateTask->abort();
+        }
+    }
+    return true;
 }
-- 
cgit v1.2.3