summaryrefslogtreecommitdiffstats
path: root/logic/MinecraftProcess.cpp
diff options
context:
space:
mode:
authorSky <git@bunnies.cc>2013-10-26 11:13:14 +0100
committerSky <git@bunnies.cc>2013-10-26 11:13:14 +0100
commit1f28a3b8af228ec40412571859f15ea216ccb52a (patch)
tree975225cfc5981d9f8e5b79ba224db02782aa4faf /logic/MinecraftProcess.cpp
parentcf07b90bdaf7dda2cbdd8ae9a7212c04badd0b09 (diff)
parentc467ebf1327d6266fc51443edfac6f0b536b6602 (diff)
downloadMultiMC-1f28a3b8af228ec40412571859f15ea216ccb52a.tar
MultiMC-1f28a3b8af228ec40412571859f15ea216ccb52a.tar.gz
MultiMC-1f28a3b8af228ec40412571859f15ea216ccb52a.tar.lz
MultiMC-1f28a3b8af228ec40412571859f15ea216ccb52a.tar.xz
MultiMC-1f28a3b8af228ec40412571859f15ea216ccb52a.zip
Merge branch 'develop'
Diffstat (limited to 'logic/MinecraftProcess.cpp')
-rw-r--r--logic/MinecraftProcess.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/logic/MinecraftProcess.cpp b/logic/MinecraftProcess.cpp
index 06b7a1f1..ff122628 100644
--- a/logic/MinecraftProcess.cpp
+++ b/logic/MinecraftProcess.cpp
@@ -138,7 +138,7 @@ void MinecraftProcess::finish(int code, ExitStatus status)
}
}
m_instance->cleanupAfterRun();
- emit ended();
+ emit ended(m_instance);
}
void MinecraftProcess::killMinecraft()
@@ -193,4 +193,4 @@ MessageLevel::Enum MinecraftProcess::getLevel(const QString &line, MessageLevel:
if (line.contains("[DEBUG]"))
level = MessageLevel::Debug;
return level;
-} \ No newline at end of file
+}