diff options
| author | Petr Mrázek <peterix@gmail.com> | 2013-11-12 09:35:53 +0100 |
|---|---|---|
| committer | Petr Mrázek <peterix@gmail.com> | 2013-11-12 09:35:53 +0100 |
| commit | ee595fb1daa3c09215e3063321301e6746733662 (patch) | |
| tree | c4cee6d1c623d60bd51bc254649749824f36d539 /gui/MainWindow.h | |
| parent | 997054a5351cd6187f578d2ac24df661027bf7cc (diff) | |
| parent | fdc58bb91360c04eed13a4fd4f8323a6a467dc37 (diff) | |
| download | MultiMC-ee595fb1daa3c09215e3063321301e6746733662.tar MultiMC-ee595fb1daa3c09215e3063321301e6746733662.tar.gz MultiMC-ee595fb1daa3c09215e3063321301e6746733662.tar.lz MultiMC-ee595fb1daa3c09215e3063321301e6746733662.tar.xz MultiMC-ee595fb1daa3c09215e3063321301e6746733662.zip | |
Merge branch 'develop'
Diffstat (limited to 'gui/MainWindow.h')
| -rw-r--r-- | gui/MainWindow.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/gui/MainWindow.h b/gui/MainWindow.h index 97aa0d9f..798df0f9 100644 --- a/gui/MainWindow.h +++ b/gui/MainWindow.h @@ -16,6 +16,7 @@ #pragma once #include <QMainWindow> +#include <QProcess> #include "logic/lists/InstanceList.h" #include "logic/net/LoginTask.h" @@ -115,7 +116,7 @@ slots: void on_actionChangeInstLWJGLVersion_triggered(); - void instanceEnded(BaseInstance *instance); + void instanceEnded(BaseInstance *instance, int code, QProcess::ExitStatus status); void on_actionInstanceSettings_triggered(); |