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/PreLaunchCommand.cpp | 98 ++++++++++++++---------------
 1 file changed, 49 insertions(+), 49 deletions(-)

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

diff --git a/api/logic/launch/steps/PreLaunchCommand.cpp b/api/logic/launch/steps/PreLaunchCommand.cpp
index 7c37d5cb..6f1f280d 100644
--- a/api/logic/launch/steps/PreLaunchCommand.cpp
+++ b/api/logic/launch/steps/PreLaunchCommand.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,68 +18,68 @@
 
 PreLaunchCommand::PreLaunchCommand(LaunchTask *parent) : LaunchStep(parent)
 {
-	auto instance = m_parent->instance();
-	m_command = instance->getPreLaunchCommand();
-	m_process.setProcessEnvironment(instance->createEnvironment());
-	connect(&m_process, &LoggedProcess::log, this, &PreLaunchCommand::logLines);
-	connect(&m_process, &LoggedProcess::stateChanged, this, &PreLaunchCommand::on_state);
+    auto instance = m_parent->instance();
+    m_command = instance->getPreLaunchCommand();
+    m_process.setProcessEnvironment(instance->createEnvironment());
+    connect(&m_process, &LoggedProcess::log, this, &PreLaunchCommand::logLines);
+    connect(&m_process, &LoggedProcess::stateChanged, this, &PreLaunchCommand::on_state);
 }
 
 void PreLaunchCommand::executeTask()
 {
-	//FIXME: where to put this?
-	QString prelaunch_cmd = m_parent->substituteVariables(m_command);
-	emit logLine(tr("Running Pre-Launch command: %1").arg(prelaunch_cmd), MessageLevel::MultiMC);
-	m_process.start(prelaunch_cmd);
+    //FIXME: where to put this?
+    QString prelaunch_cmd = m_parent->substituteVariables(m_command);
+    emit logLine(tr("Running Pre-Launch command: %1").arg(prelaunch_cmd), MessageLevel::MultiMC);
+    m_process.start(prelaunch_cmd);
 }
 
 void PreLaunchCommand::on_state(LoggedProcess::State state)
 {
-	auto getError = [&]()
-	{
-		return tr("Pre-Launch command failed with code %1.\n\n").arg(m_process.exitCode());
-	};
-	switch(state)
-	{
-		case LoggedProcess::Aborted:
-		case LoggedProcess::Crashed:
-		case LoggedProcess::FailedToStart:
-		{
-			auto error = getError();
-			emit logLine(error, MessageLevel::Fatal);
-			emitFailed(error);
-			return;
-		}
-		case LoggedProcess::Finished:
-		{
-			if(m_process.exitCode() != 0)
-			{
-				auto error = getError();
-				emit logLine(error, MessageLevel::Fatal);
-				emitFailed(error);
-			}
-			else
-			{
-				emit logLine(tr("Pre-Launch command ran successfully.\n\n"), MessageLevel::MultiMC);
-				emitSucceeded();
-			}
-		}
-		default:
-			break;
-	}
+    auto getError = [&]()
+    {
+        return tr("Pre-Launch command failed with code %1.\n\n").arg(m_process.exitCode());
+    };
+    switch(state)
+    {
+        case LoggedProcess::Aborted:
+        case LoggedProcess::Crashed:
+        case LoggedProcess::FailedToStart:
+        {
+            auto error = getError();
+            emit logLine(error, MessageLevel::Fatal);
+            emitFailed(error);
+            return;
+        }
+        case LoggedProcess::Finished:
+        {
+            if(m_process.exitCode() != 0)
+            {
+                auto error = getError();
+                emit logLine(error, MessageLevel::Fatal);
+                emitFailed(error);
+            }
+            else
+            {
+                emit logLine(tr("Pre-Launch command ran successfully.\n\n"), MessageLevel::MultiMC);
+                emitSucceeded();
+            }
+        }
+        default:
+            break;
+    }
 }
 
 void PreLaunchCommand::setWorkingDirectory(const QString &wd)
 {
-	m_process.setWorkingDirectory(wd);
+    m_process.setWorkingDirectory(wd);
 }
 
 bool PreLaunchCommand::abort()
 {
-	auto state = m_process.state();
-	if (state == LoggedProcess::Running || state == LoggedProcess::Starting)
-	{
-		m_process.kill();
-	}
-	return true;
+    auto state = m_process.state();
+    if (state == LoggedProcess::Running || state == LoggedProcess::Starting)
+    {
+        m_process.kill();
+    }
+    return true;
 }
-- 
cgit v1.2.3