Merge pull request #2705 from Janrupf/feature/fix_external_deletion_interaction

GH-2515 Save instance ID before display dialog

2 files changed, 3 insertions, 2 deletions

diff --git a/api/logic/InstanceList.cpp b/api/logic/InstanceList.cpp
index af4e85cf..c713b626 100644
--- a/api/logic/InstanceList.cpp
+++ b/api/logic/InstanceList.cpp
@@ -234,7 +234,7 @@ void InstanceList::deleteInstance(const InstanceId& id)
     auto inst = getInstanceById(id);
     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;
     }
 
diff --git a/application/MainWindow.cpp b/application/MainWindow.cpp
index a4ef4e51..00f95fca 100644
--- a/application/MainWindow.cpp
+++ b/application/MainWindow.cpp
@@ -1667,6 +1667,7 @@ void MainWindow::on_actionDeleteInstance_triggered()
     {
         return;
     }
+    auto id = m_selectedInstance->id();
     auto response = CustomMessageBox::selectable(
         this,
         tr("CAREFUL!"),
@@ -1677,7 +1678,7 @@ void MainWindow::on_actionDeleteInstance_triggered()
     )->exec();
     if (response == QMessageBox::Yes)
     {
-        MMC->instances()->deleteInstance(m_selectedInstance->id());
+        MMC->instances()->deleteInstance(id);
     }
 }