From 66ffab71ae6bd4731ba02987c108561ab90be75c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Petr=20Mr=C3=A1zek?= Date: Sat, 26 Nov 2016 18:06:08 +0100 Subject: NOISSUE allow killing the instance from main window --- application/InstanceWindow.cpp | 13 ++----------- 1 file changed, 2 insertions(+), 11 deletions(-) (limited to 'application/InstanceWindow.cpp') diff --git a/application/InstanceWindow.cpp b/application/InstanceWindow.cpp index e3d4af66..b88048a8 100644 --- a/application/InstanceWindow.cpp +++ b/application/InstanceWindow.cpp @@ -168,18 +168,9 @@ void InstanceWindow::on_btnKillMinecraft_clicked() { if(m_instance->isRunning()) { - auto response = CustomMessageBox::selectable( - this, tr("Kill Minecraft?"), - tr("This can cause the instance to get corrupted and should only be used if Minecraft " - "is frozen for some reason"), - QMessageBox::Question, QMessageBox::Yes | QMessageBox::No, QMessageBox::Yes)->exec(); - if (response == QMessageBox::Yes) - { - m_proc->abort(); - } + MMC->kill(m_instance); } - // FIXME: duplicate logic between MainWindow and InstanceWindow - else if(saveAll()) + else { MMC->launch(m_instance, true, nullptr); } -- cgit v1.2.3