diff options
| author | Petr Mrázek <peterix@gmail.com> | 2013-11-13 00:25:57 +0100 |
|---|---|---|
| committer | Petr Mrázek <peterix@gmail.com> | 2013-11-13 00:25:57 +0100 |
| commit | 662b4bc8cbf93eea5e57a5cd56962313eb0a966c (patch) | |
| tree | f86178bcfe62ce3aae89f3eff0e538a87b7d7bed /gui/MainWindow.cpp | |
| parent | ee595fb1daa3c09215e3063321301e6746733662 (diff) | |
| parent | 9693a5e6e96e815ad7617c888ef176e5fe97c9e3 (diff) | |
| download | PrismLauncher-662b4bc8cbf93eea5e57a5cd56962313eb0a966c.tar.gz PrismLauncher-662b4bc8cbf93eea5e57a5cd56962313eb0a966c.tar.bz2 PrismLauncher-662b4bc8cbf93eea5e57a5cd56962313eb0a966c.zip | |
Merge branch 'develop'
Diffstat (limited to 'gui/MainWindow.cpp')
| -rw-r--r-- | gui/MainWindow.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/gui/MainWindow.cpp b/gui/MainWindow.cpp index c0815d18..1664a21d 100644 --- a/gui/MainWindow.cpp +++ b/gui/MainWindow.cpp @@ -725,8 +725,8 @@ void MainWindow::launchInstance(BaseInstance *instance, LoginResponse response) connect(proc, SIGNAL(log(QString, MessageLevel::Enum)), console, SLOT(write(QString, MessageLevel::Enum))); - connect(proc, SIGNAL(ended(BaseInstance *, int, ExitStatus)), this, - SLOT(instanceEnded(BaseInstance *, int, ExitStatus))); + connect(proc, SIGNAL(ended(BaseInstance*,int,QProcess::ExitStatus)), this, + SLOT(instanceEnded(BaseInstance*,int,QProcess::ExitStatus))); if (instance->settings().get("ShowConsole").toBool()) { |