summaryrefslogtreecommitdiffstats
path: root/logic/MinecraftProcess.h
diff options
context:
space:
mode:
authorPetr Mrázek <peterix@gmail.com>2014-03-19 22:26:50 +0100
committerPetr Mrázek <peterix@gmail.com>2014-03-19 22:26:50 +0100
commit4623c1b34f35dd896a9ccacd9b982bca9dc0b880 (patch)
tree44ff87e0029dbc8cf5f6a839359414ffeb1ff180 /logic/MinecraftProcess.h
parent39d37394423dc204efe774920a59ce010781b28c (diff)
parenta74f3b553ab3294e153d73366294e7c8fbc2372f (diff)
downloadMultiMC-4623c1b34f35dd896a9ccacd9b982bca9dc0b880.tar
MultiMC-4623c1b34f35dd896a9ccacd9b982bca9dc0b880.tar.gz
MultiMC-4623c1b34f35dd896a9ccacd9b982bca9dc0b880.tar.lz
MultiMC-4623c1b34f35dd896a9ccacd9b982bca9dc0b880.tar.xz
MultiMC-4623c1b34f35dd896a9ccacd9b982bca9dc0b880.zip
Merge remote-tracking branch 'origin/feature_fix_timeout' into develop
Diffstat (limited to 'logic/MinecraftProcess.h')
-rw-r--r--logic/MinecraftProcess.h1
1 files changed, 1 insertions, 0 deletions
diff --git a/logic/MinecraftProcess.h b/logic/MinecraftProcess.h
index d91dad56..d47a6cd2 100644
--- a/logic/MinecraftProcess.h
+++ b/logic/MinecraftProcess.h
@@ -133,6 +133,7 @@ protected:
bool preLaunch();
bool postLaunch();
+ bool waitForPrePost();
QMap<QString, QString> getVariables() const;
QString substituteVariables(const QString &cmd) const;