diff options
| author | Petr Mrázek <peterix@gmail.com> | 2014-02-24 00:29:13 +0100 |
|---|---|---|
| committer | Petr Mrázek <peterix@gmail.com> | 2014-02-24 00:29:13 +0100 |
| commit | f7c97efcf3785f597417895945b24c2e7476cba8 (patch) | |
| tree | c0ad8ba4b59bf9be441c2037ae7592585c3cbe58 /logic/MinecraftProcess.cpp | |
| parent | e3d2e5fd7405baa8137e300e8cc817e70df172b7 (diff) | |
| parent | a354e8bfae812b23b85b65c4a5b7e860cb18080c (diff) | |
| download | MultiMC-f7c97efcf3785f597417895945b24c2e7476cba8.tar MultiMC-f7c97efcf3785f597417895945b24c2e7476cba8.tar.gz MultiMC-f7c97efcf3785f597417895945b24c2e7476cba8.tar.lz MultiMC-f7c97efcf3785f597417895945b24c2e7476cba8.tar.xz MultiMC-f7c97efcf3785f597417895945b24c2e7476cba8.zip | |
Merge branch 'feature_profiling' into integration_json_and_tools
Diffstat (limited to 'logic/MinecraftProcess.cpp')
| -rw-r--r-- | logic/MinecraftProcess.cpp | 16 |
1 files changed, 15 insertions, 1 deletions
diff --git a/logic/MinecraftProcess.cpp b/logic/MinecraftProcess.cpp index 70a9d55f..89cd71ed 100644 --- a/logic/MinecraftProcess.cpp +++ b/logic/MinecraftProcess.cpp @@ -288,7 +288,7 @@ void MinecraftProcess::killMinecraft() kill(); } -void MinecraftProcess::launch() +void MinecraftProcess::arm() { emit log("MultiMC version: " + MMC->version().toString() + "\n\n"); emit log("Minecraft folder is:\n" + workingDirectory() + "\n\n"); @@ -374,3 +374,17 @@ void MinecraftProcess::launch() QByteArray bytes = launchScript.toUtf8(); writeData(bytes.constData(), bytes.length()); } + +void MinecraftProcess::launch() +{ + QString launchString("launch\n"); + QByteArray bytes = launchString.toUtf8(); + writeData(bytes.constData(), bytes.length()); +} + +void MinecraftProcess::abort() +{ + QString launchString("abort\n"); + QByteArray bytes = launchString.toUtf8(); + writeData(bytes.constData(), bytes.length()); +} |