1 files changed, 103 insertions, 101 deletions

diff --git a/launcher/minecraft/launch/DirectJavaLaunch.cpp b/launcher/minecraft/launch/DirectJavaLaunch.cpp
index 4f2b55643f..c1dc249eac 100644
--- a/launcher/minecraft/launch/DirectJavaLaunch.cpp
+++ b/launcher/minecraft/launch/DirectJavaLaunch.cpp
@@ -17,7 +17,7 @@
  *
  *   You should have received a copy of the GNU General Public License
  *   along with this program.  If not, see <https://www.gnu.org/licenses/>.
- *  
+ *
  *  This file incorporates work covered by the following copyright and
  *  permission notice:
  *
@@ -43,129 +43,131 @@
 #include <Commandline.h>
 #include <QStandardPaths>
 
-DirectJavaLaunch::DirectJavaLaunch(LaunchTask *parent) : LaunchStep(parent)
+DirectJavaLaunch::DirectJavaLaunch(LaunchTask* parent) : LaunchStep(parent)
 {
-    connect(&m_process, &LoggedProcess::log, this, &DirectJavaLaunch::logLines);
-    connect(&m_process, &LoggedProcess::stateChanged, this, &DirectJavaLaunch::on_state);
+	connect(&m_process, &LoggedProcess::log, this, &DirectJavaLaunch::logLines);
+	connect(&m_process, &LoggedProcess::stateChanged, this,
+			&DirectJavaLaunch::on_state);
 }
 
 void DirectJavaLaunch::executeTask()
 {
-    auto instance = m_parent->instance();
-    std::shared_ptr<MinecraftInstance> minecraftInstance = std::dynamic_pointer_cast<MinecraftInstance>(instance);
-    QStringList args = minecraftInstance->javaArguments();
+	auto instance = m_parent->instance();
+	std::shared_ptr<MinecraftInstance> minecraftInstance =
+		std::dynamic_pointer_cast<MinecraftInstance>(instance);
+	QStringList args = minecraftInstance->javaArguments();
 
-    args.append("-Djava.library.path=" + minecraftInstance->getNativePath());
+	args.append("-Djava.library.path=" + minecraftInstance->getNativePath());
 
-    auto classPathEntries = minecraftInstance->getClassPath();
-    args.append("-cp");
-    QString classpath;
+	auto classPathEntries = minecraftInstance->getClassPath();
+	args.append("-cp");
+	QString classpath;
 #ifdef Q_OS_WIN32
-    classpath = classPathEntries.join(';');
+	classpath = classPathEntries.join(';');
 #else
-    classpath = classPathEntries.join(':');
+	classpath = classPathEntries.join(':');
 #endif
-    args.append(classpath);
-    args.append(minecraftInstance->getMainClass());
-
-    QString allArgs = args.join(", ");
-    emit logLine("Java Arguments:\n[" + m_parent->censorPrivateInfo(allArgs) + "]\n\n", MessageLevel::MeshMC);
-
-    auto javaPath = FS::ResolveExecutable(instance->settings()->get("JavaPath").toString());
-
-    m_process.setProcessEnvironment(instance->createEnvironment());
-
-    // make detachable - this will keep the process running even if the object is destroyed
-    m_process.setDetachable(true);
-
-    auto mcArgs = minecraftInstance->processMinecraftArgs(m_session, m_serverToJoin);
-    args.append(mcArgs);
-
-    QString wrapperCommandStr = instance->getWrapperCommand().trimmed();
-    if(!wrapperCommandStr.isEmpty())
-    {
-        auto wrapperArgs = Commandline::splitArgs(wrapperCommandStr);
-        auto wrapperCommand = wrapperArgs.takeFirst();
-        auto realWrapperCommand = QStandardPaths::findExecutable(wrapperCommand);
-        if (realWrapperCommand.isEmpty())
-        {
-            const char *reason = QT_TR_NOOP("The wrapper command \"%1\" couldn't be found.");
-            emit logLine(QString(reason).arg(wrapperCommand), MessageLevel::Fatal);
-            emitFailed(tr(reason).arg(wrapperCommand));
-            return;
-        }
-        emit logLine("Wrapper command is:\n" + wrapperCommandStr + "\n\n", MessageLevel::MeshMC);
-        args.prepend(javaPath);
-        m_process.start(wrapperCommand, wrapperArgs + args);
-    }
-    else
-    {
-        m_process.start(javaPath, args);
-    }
+	args.append(classpath);
+	args.append(minecraftInstance->getMainClass());
+
+	QString allArgs = args.join(", ");
+	emit logLine("Java Arguments:\n[" + m_parent->censorPrivateInfo(allArgs) +
+					 "]\n\n",
+				 MessageLevel::MeshMC);
+
+	auto javaPath =
+		FS::ResolveExecutable(instance->settings()->get("JavaPath").toString());
+
+	m_process.setProcessEnvironment(instance->createEnvironment());
+
+	// make detachable - this will keep the process running even if the object
+	// is destroyed
+	m_process.setDetachable(true);
+
+	auto mcArgs =
+		minecraftInstance->processMinecraftArgs(m_session, m_serverToJoin);
+	args.append(mcArgs);
+
+	QString wrapperCommandStr = instance->getWrapperCommand().trimmed();
+	if (!wrapperCommandStr.isEmpty()) {
+		auto wrapperArgs = Commandline::splitArgs(wrapperCommandStr);
+		auto wrapperCommand = wrapperArgs.takeFirst();
+		auto realWrapperCommand =
+			QStandardPaths::findExecutable(wrapperCommand);
+		if (realWrapperCommand.isEmpty()) {
+			const char* reason =
+				QT_TR_NOOP("The wrapper command \"%1\" couldn't be found.");
+			emit logLine(QString(reason).arg(wrapperCommand),
+						 MessageLevel::Fatal);
+			emitFailed(tr(reason).arg(wrapperCommand));
+			return;
+		}
+		emit logLine("Wrapper command is:\n" + wrapperCommandStr + "\n\n",
+					 MessageLevel::MeshMC);
+		args.prepend(javaPath);
+		m_process.start(wrapperCommand, wrapperArgs + args);
+	} else {
+		m_process.start(javaPath, args);
+	}
 }
 
 void DirectJavaLaunch::on_state(LoggedProcess::State state)
 {
-    switch(state)
-    {
-        case LoggedProcess::FailedToStart:
-        {
-            //: Error message displayed if instance can't start
-            const char *reason = QT_TR_NOOP("Could not launch minecraft!");
-            emit logLine(reason, MessageLevel::Fatal);
-            emitFailed(tr(reason));
-            return;
-        }
-        case LoggedProcess::Aborted:
-        case LoggedProcess::Crashed:
-        {
-            m_parent->setPid(-1);
-            emitFailed(tr("Game crashed."));
-            return;
-        }
-        case LoggedProcess::Finished:
-        {
-            m_parent->setPid(-1);
-            // if the exit code wasn't 0, report this as a crash
-            auto exitCode = m_process.exitCode();
-            if(exitCode != 0)
-            {
-                emitFailed(tr("Game crashed."));
-                return;
-            }
-            //FIXME: make this work again
-            // m_postlaunchprocess.processEnvironment().insert("INST_EXITCODE", QString(exitCode));
-            // run post-exit
-            emitSucceeded();
-            break;
-        }
-        case LoggedProcess::Running:
-            emit logLine(QString("Minecraft process ID: %1\n\n").arg(m_process.processId()), MessageLevel::MeshMC);
-            m_parent->setPid(m_process.processId());
-            m_parent->instance()->setLastLaunch();
-            break;
-        default:
-            break;
-    }
+	switch (state) {
+		case LoggedProcess::FailedToStart: {
+			//: Error message displayed if instance can't start
+			const char* reason = QT_TR_NOOP("Could not launch minecraft!");
+			emit logLine(reason, MessageLevel::Fatal);
+			emitFailed(tr(reason));
+			return;
+		}
+		case LoggedProcess::Aborted:
+		case LoggedProcess::Crashed: {
+			m_parent->setPid(-1);
+			emitFailed(tr("Game crashed."));
+			return;
+		}
+		case LoggedProcess::Finished: {
+			m_parent->setPid(-1);
+			// if the exit code wasn't 0, report this as a crash
+			auto exitCode = m_process.exitCode();
+			if (exitCode != 0) {
+				emitFailed(tr("Game crashed."));
+				return;
+			}
+			// FIXME: make this work again
+			//  m_postlaunchprocess.processEnvironment().insert("INST_EXITCODE",
+			//  QString(exitCode)); run post-exit
+			emitSucceeded();
+			break;
+		}
+		case LoggedProcess::Running:
+			emit logLine(QString("Minecraft process ID: %1\n\n")
+							 .arg(m_process.processId()),
+						 MessageLevel::MeshMC);
+			m_parent->setPid(m_process.processId());
+			m_parent->instance()->setLastLaunch();
+			break;
+		default:
+			break;
+	}
 }
 
-void DirectJavaLaunch::setWorkingDirectory(const QString &wd)
+void DirectJavaLaunch::setWorkingDirectory(const QString& wd)
 {
-    m_process.setWorkingDirectory(wd);
+	m_process.setWorkingDirectory(wd);
 }
 
 void DirectJavaLaunch::proceed()
 {
-    // nil
+	// nil
 }
 
 bool DirectJavaLaunch::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;
 }
-