diff options
| author | Petr Mrázek <peterix@gmail.com> | 2016-10-30 02:37:38 +0100 |
|---|---|---|
| committer | Petr Mrázek <peterix@gmail.com> | 2016-10-30 02:37:38 +0100 |
| commit | 412855ae3d967ff81a383688397c4d9448a4ee15 (patch) | |
| tree | 78d6225067f39a2696dfb9ca0d40eaed237fe9ee /application/InstanceWindow.cpp | |
| parent | deabfa78f8e66d1af40d0ecfd787d034cffd5431 (diff) | |
| download | MultiMC-412855ae3d967ff81a383688397c4d9448a4ee15.tar MultiMC-412855ae3d967ff81a383688397c4d9448a4ee15.tar.gz MultiMC-412855ae3d967ff81a383688397c4d9448a4ee15.tar.lz MultiMC-412855ae3d967ff81a383688397c4d9448a4ee15.tar.xz MultiMC-412855ae3d967ff81a383688397c4d9448a4ee15.zip | |
NOISSUE refactor window management and launch, make MultiMC a single instance application.
Diffstat (limited to 'application/InstanceWindow.cpp')
| -rw-r--r-- | application/InstanceWindow.cpp | 11 |
1 files changed, 1 insertions, 10 deletions
diff --git a/application/InstanceWindow.cpp b/application/InstanceWindow.cpp index 7b3e1d10..1c7731bd 100644 --- a/application/InstanceWindow.cpp +++ b/application/InstanceWindow.cpp @@ -174,11 +174,6 @@ void InstanceWindow::closeEvent(QCloseEvent *event) MMC->settings()->set("ConsoleWindowGeometry", saveGeometry().toBase64()); emit isClosing(); event->accept(); - if(m_shouldQuit) - { - // this needs to be delayed so we don't do horrible things - QMetaObject::invokeMethod(MMC, "quit", Qt::QueuedConnection); - } } bool InstanceWindow::saveAll() @@ -203,11 +198,7 @@ void InstanceWindow::on_btnKillMinecraft_clicked() // FIXME: duplicate logic between MainWindow and InstanceWindow else if(saveAll()) { - m_launchController.reset(new LaunchController()); - m_launchController->setInstance(m_instance); - m_launchController->setOnline(true); - m_launchController->setParentWidget(this); - m_launchController->start(); + MMC->launch(m_instance, true, nullptr); } } |