summaryrefslogtreecommitdiffstats
path: root/logic
diff options
context:
space:
mode:
authorSky <git@bunnies.cc>2013-10-22 18:25:10 +0100
committerSky <git@bunnies.cc>2013-10-22 18:25:10 +0100
commitc65bab6efec27d7b0654609798f77dd617d33d2d (patch)
tree70a7cd21909ed15717f612ab69a14dd5a0541d7f /logic
parent1d2183ea29a0a5d65348700d4e043dbdb22b3632 (diff)
downloadMultiMC-c65bab6efec27d7b0654609798f77dd617d33d2d.tar
MultiMC-c65bab6efec27d7b0654609798f77dd617d33d2d.tar.gz
MultiMC-c65bab6efec27d7b0654609798f77dd617d33d2d.tar.lz
MultiMC-c65bab6efec27d7b0654609798f77dd617d33d2d.tar.xz
MultiMC-c65bab6efec27d7b0654609798f77dd617d33d2d.zip
Respect console options (opening a console at all, automatically closing)
Diffstat (limited to 'logic')
-rw-r--r--logic/MinecraftProcess.cpp4
-rw-r--r--logic/MinecraftProcess.h2
2 files changed, 3 insertions, 3 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
+}
diff --git a/logic/MinecraftProcess.h b/logic/MinecraftProcess.h
index a1dfa23f..812559d5 100644
--- a/logic/MinecraftProcess.h
+++ b/logic/MinecraftProcess.h
@@ -67,7 +67,7 @@ signals:
/**
* @brief emitted when mc has finished and the PostLaunchCommand was run
*/
- void ended();
+ void ended(BaseInstance*);
/**
* @brief emitted when we want to log something