summaryrefslogtreecommitdiffstats
path: root/gui/ConsoleWindow.h
diff options
context:
space:
mode:
authorPetr Mrázek <peterix@gmail.com>2013-11-12 09:35:53 +0100
committerPetr Mrázek <peterix@gmail.com>2013-11-12 09:35:53 +0100
commitee595fb1daa3c09215e3063321301e6746733662 (patch)
treec4cee6d1c623d60bd51bc254649749824f36d539 /gui/ConsoleWindow.h
parent997054a5351cd6187f578d2ac24df661027bf7cc (diff)
parentfdc58bb91360c04eed13a4fd4f8323a6a467dc37 (diff)
downloadMultiMC-ee595fb1daa3c09215e3063321301e6746733662.tar
MultiMC-ee595fb1daa3c09215e3063321301e6746733662.tar.gz
MultiMC-ee595fb1daa3c09215e3063321301e6746733662.tar.lz
MultiMC-ee595fb1daa3c09215e3063321301e6746733662.tar.xz
MultiMC-ee595fb1daa3c09215e3063321301e6746733662.zip
Merge branch 'develop'
Diffstat (limited to 'gui/ConsoleWindow.h')
-rw-r--r--gui/ConsoleWindow.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/gui/ConsoleWindow.h b/gui/ConsoleWindow.h
index 0ed35554..65786c7e 100644
--- a/gui/ConsoleWindow.h
+++ b/gui/ConsoleWindow.h
@@ -66,7 +66,7 @@ private
slots:
void on_closeButton_clicked();
void on_btnKillMinecraft_clicked();
- void onEnded(BaseInstance *instance);
+ void onEnded(BaseInstance *instance, int code, QProcess::ExitStatus status);
protected:
void closeEvent(QCloseEvent *);