merged from 0.6.7 codebase

1 files changed, 32 insertions, 33 deletions

diff --git a/api/logic/InstanceCopyTask.cpp b/api/logic/InstanceCopyTask.cpp
index 62c22362..a576a0fd 100644
--- a/api/logic/InstanceCopyTask.cpp
+++ b/api/logic/InstanceCopyTask.cpp
@@ -1,5 +1,4 @@
 #include "InstanceCopyTask.h"
-#include "BaseInstanceProvider.h"
 #include "settings/INISettingsObject.h"
 #include "FileSystem.h"
 #include "NullInstance.h"
@@ -8,50 +7,50 @@
 
 InstanceCopyTask::InstanceCopyTask(InstancePtr origInstance, bool copySaves)
 {
-	m_origInstance = origInstance;
-
-	if(!copySaves)
-	{
-		// FIXME: get this from the original instance type...
-		auto matcherReal = new RegexpMatcher("[.]?minecraft/saves");
-		matcherReal->caseSensitive(false);
-		m_matcher.reset(matcherReal);
-	}
+    m_origInstance = origInstance;
+
+    if(!copySaves)
+    {
+        // FIXME: get this from the original instance type...
+        auto matcherReal = new RegexpMatcher("[.]?minecraft/saves");
+        matcherReal->caseSensitive(false);
+        m_matcher.reset(matcherReal);
+    }
 }
 
 void InstanceCopyTask::executeTask()
 {
-	setStatus(tr("Copying instance %1").arg(m_origInstance->name()));
+    setStatus(tr("Copying instance %1").arg(m_origInstance->name()));
 
-	FS::copy folderCopy(m_origInstance->instanceRoot(), m_stagingPath);
-	folderCopy.followSymlinks(false).blacklist(m_matcher.get());
+    FS::copy folderCopy(m_origInstance->instanceRoot(), m_stagingPath);
+    folderCopy.followSymlinks(false).blacklist(m_matcher.get());
 
-	m_copyFuture = QtConcurrent::run(QThreadPool::globalInstance(), folderCopy);
-	connect(&m_copyFutureWatcher, &QFutureWatcher<bool>::finished, this, &InstanceCopyTask::copyFinished);
-	connect(&m_copyFutureWatcher, &QFutureWatcher<bool>::canceled, this, &InstanceCopyTask::copyAborted);
-	m_copyFutureWatcher.setFuture(m_copyFuture);
+    m_copyFuture = QtConcurrent::run(QThreadPool::globalInstance(), folderCopy);
+    connect(&m_copyFutureWatcher, &QFutureWatcher<bool>::finished, this, &InstanceCopyTask::copyFinished);
+    connect(&m_copyFutureWatcher, &QFutureWatcher<bool>::canceled, this, &InstanceCopyTask::copyAborted);
+    m_copyFutureWatcher.setFuture(m_copyFuture);
 }
 
 void InstanceCopyTask::copyFinished()
 {
-	auto successful = m_copyFuture.result();
-	if(!successful)
-	{
-		emitFailed(tr("Instance folder copy failed."));
-		return;
-	}
-	// FIXME: shouldn't this be able to report errors?
-	auto instanceSettings = std::make_shared<INISettingsObject>(FS::PathCombine(m_stagingPath, "instance.cfg"));
-	instanceSettings->registerSetting("InstanceType", "Legacy");
-
-	InstancePtr inst(new NullInstance(m_globalSettings, instanceSettings, m_stagingPath));
-	inst->setName(m_instName);
-	inst->setIconKey(m_instIcon);
-	emitSucceeded();
+    auto successful = m_copyFuture.result();
+    if(!successful)
+    {
+        emitFailed(tr("Instance folder copy failed."));
+        return;
+    }
+    // FIXME: shouldn't this be able to report errors?
+    auto instanceSettings = std::make_shared<INISettingsObject>(FS::PathCombine(m_stagingPath, "instance.cfg"));
+    instanceSettings->registerSetting("InstanceType", "Legacy");
+
+    InstancePtr inst(new NullInstance(m_globalSettings, instanceSettings, m_stagingPath));
+    inst->setName(m_instName);
+    inst->setIconKey(m_instIcon);
+    emitSucceeded();
 }
 
 void InstanceCopyTask::copyAborted()
 {
-	emitFailed(tr("Instance folder copy has been aborted."));
-	return;
+    emitFailed(tr("Instance folder copy has been aborted."));
+    return;
 }