diff options
author | Petr Mrázek <peterix@gmail.com> | 2013-11-23 01:41:28 +0100 |
---|---|---|
committer | Petr Mrázek <peterix@gmail.com> | 2013-11-23 01:41:28 +0100 |
commit | 4124faf474908e4d79d93b0f624bf8fd81bd9972 (patch) | |
tree | 335087d96ddab6b862c187969749134be6b4d96e /gui/MainWindow.cpp | |
parent | 7f5eb5d61ad5c94da5e3a0443ffbcd9088285496 (diff) | |
download | MultiMC-4124faf474908e4d79d93b0f624bf8fd81bd9972.tar MultiMC-4124faf474908e4d79d93b0f624bf8fd81bd9972.tar.gz MultiMC-4124faf474908e4d79d93b0f624bf8fd81bd9972.tar.lz MultiMC-4124faf474908e4d79d93b0f624bf8fd81bd9972.tar.xz MultiMC-4124faf474908e4d79d93b0f624bf8fd81bd9972.zip |
Fix console window (now not a QDialog)
It now opens and coloses as expected, depending on user
preferences and the status of the various processes involved.
Console window geometry and state are remembered between runs.
Diffstat (limited to 'gui/MainWindow.cpp')
-rw-r--r-- | gui/MainWindow.cpp | 29 |
1 files changed, 3 insertions, 26 deletions
diff --git a/gui/MainWindow.cpp b/gui/MainWindow.cpp index 842014d3..fc1b631c 100644 --- a/gui/MainWindow.cpp +++ b/gui/MainWindow.cpp @@ -712,27 +712,10 @@ void MainWindow::launchInstance(BaseInstance *instance, LoginResponse response) if (!proc) return; - // Prepare GUI: If it shall stay open disable the required parts - if (MMC->settings()->get("NoHide").toBool()) - { - ui->actionLaunchInstance->setEnabled(false); - } - else - { - this->hide(); - } + this->hide(); console = new ConsoleWindow(proc); - - connect(proc, SIGNAL(log(QString, MessageLevel::Enum)), console, - SLOT(write(QString, MessageLevel::Enum))); - connect(proc, SIGNAL(ended(BaseInstance*,int,QProcess::ExitStatus)), this, - SLOT(instanceEnded(BaseInstance*,int,QProcess::ExitStatus))); - - if (instance->settings().get("ShowConsole").toBool()) - { - console->show(); - } + connect(console, SIGNAL(isClosing()), this, SLOT(instanceEnded())); proc->setLogin(response.username, response.session_id); proc->launch(); @@ -884,15 +867,9 @@ void MainWindow::on_actionEditInstNotes_triggered() } } -void MainWindow::instanceEnded(BaseInstance *instance, int code, QProcess::ExitStatus status) +void MainWindow::instanceEnded() { this->show(); - ui->actionLaunchInstance->setEnabled(m_selectedInstance); - - if (instance->settings().get("AutoCloseConsole").toBool()) - { - console->close(); - } } void MainWindow::checkSetDefaultJava() |