mirror/MultiMC5
1
0
Fork 0
mirror of https://github.com/MultiMC/MultiMC5.git synced 2024-10-06 06:50:16 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #2705 from Janrupf/feature/fix_external_deletion_interaction

Browse Source 
GH-2515 Save instance ID before display dialog
This commit is contained in:
Petr Mrázek 2019-06-23 21:31:56 +02:00 committed by GitHub
commit 75ddbc8851
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
api/logic/InstanceList.cpp
View File

@ -234,7 +234,7 @@ void InstanceList::deleteInstance(const InstanceId& id)
auto inst = getInstanceById(id); auto inst = getInstanceById(id);
if(!inst) if(!inst)
{ {
qDebug() << "Cannot delete instance" << id << " No such instance is present."; qDebug() << "Cannot delete instance" << id << ". No such instance is present (deleted externally?).";
return; return;
} }

3
application/MainWindow.cpp
View File

@ -1667,6 +1667,7 @@ void MainWindow::on_actionDeleteInstance_triggered()
{ {
return; return;
} }
auto id = m_selectedInstance->id();
auto response = CustomMessageBox::selectable( auto response = CustomMessageBox::selectable(
this, this,
tr("CAREFUL!"), tr("CAREFUL!"),
@ -1677,7 +1678,7 @@ void MainWindow::on_actionDeleteInstance_triggered()
)->exec(); )->exec();
if (response == QMessageBox::Yes) if (response == QMessageBox::Yes)
{ {
MMC->instances()->deleteInstance(m_selectedInstance->id()); MMC->instances()->deleteInstance(id);
} }
} }