summaryrefslogtreecommitdiffstats
path: root/application/InstanceWindow.cpp
diff options
context:
space:
mode:
authorPetr Mrázek <peterix@gmail.com>2016-11-26 18:06:08 +0100
committerPetr Mrázek <peterix@gmail.com>2016-11-26 18:06:08 +0100
commit66ffab71ae6bd4731ba02987c108561ab90be75c (patch)
tree7fa46da1daf4845f37a449197f324dc7dc3599e6 /application/InstanceWindow.cpp
parentce70407363b9bdd8d7901467f2bdb91179a9ac22 (diff)
downloadMultiMC-66ffab71ae6bd4731ba02987c108561ab90be75c.tar
MultiMC-66ffab71ae6bd4731ba02987c108561ab90be75c.tar.gz
MultiMC-66ffab71ae6bd4731ba02987c108561ab90be75c.tar.lz
MultiMC-66ffab71ae6bd4731ba02987c108561ab90be75c.tar.xz
MultiMC-66ffab71ae6bd4731ba02987c108561ab90be75c.zip
NOISSUE allow killing the instance from main window
Diffstat (limited to 'application/InstanceWindow.cpp')
-rw-r--r--application/InstanceWindow.cpp13
1 files changed, 2 insertions, 11 deletions
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);
}