summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorStiepen22 <stiepen22@gmx.de>2013-09-06 18:48:41 +0200
committerStiepen22 <stiepen22@gmx.de>2013-09-06 18:48:41 +0200
commitb44e70d58dac92a21d905565370357d296942209 (patch)
treef520b1e8af39cd6b32b00d89861f993572033af3
parent2acfd00d76b79c49b61f651b5459f65803601a95 (diff)
downloadMultiMC-b44e70d58dac92a21d905565370357d296942209.tar
MultiMC-b44e70d58dac92a21d905565370357d296942209.tar.gz
MultiMC-b44e70d58dac92a21d905565370357d296942209.tar.lz
MultiMC-b44e70d58dac92a21d905565370357d296942209.tar.xz
MultiMC-b44e70d58dac92a21d905565370357d296942209.zip
started kill instance feature
-rw-r--r--logic/MinecraftProcess.cpp5
-rw-r--r--logic/MinecraftProcess.h4
2 files changed, 9 insertions, 0 deletions
diff --git a/logic/MinecraftProcess.cpp b/logic/MinecraftProcess.cpp
index d34be835..3d82008b 100644
--- a/logic/MinecraftProcess.cpp
+++ b/logic/MinecraftProcess.cpp
@@ -138,6 +138,11 @@ void MinecraftProcess::finish(int code, ExitStatus status)
emit ended();
}
+void MinecraftProcess::killMinecraft()
+{
+ killed = true;
+}
+
void MinecraftProcess::launch()
{
if (!m_instance->settings().get("PreLaunchCommand").toString().isEmpty())
diff --git a/logic/MinecraftProcess.h b/logic/MinecraftProcess.h
index 516bf986..248ad807 100644
--- a/logic/MinecraftProcess.h
+++ b/logic/MinecraftProcess.h
@@ -59,6 +59,8 @@ public:
void setMinecraftArguments(QStringList args);
+ void killMinecraft();
+
signals:
/**
* @brief emitted when mc has finished and the PostLaunchCommand was run
@@ -83,4 +85,6 @@ protected slots:
void finish(int, QProcess::ExitStatus status);
void on_stdErr();
void on_stdOut();
+private:
+ bool killed;
};