NOISSUE Granular instance reload

1 files changed, 30 insertions, 9 deletions

diff --git a/application/InstanceWindow.cpp b/application/InstanceWindow.cpp
index 3bfc78db..9fdd3ca8 100644
--- a/application/InstanceWindow.cpp
+++ b/application/InstanceWindow.cpp
@@ -95,9 +95,23 @@ InstanceWindow::InstanceWindow(InstancePtr instance, QWidget *parent)
 		connect(m_instance.get(), &BaseInstance::runningStatusChanged,
 			this, &InstanceWindow::on_RunningState_changed);
 	}
+
+	// set up instance destruction detection
+	{
+		connect(m_instance.get(), &BaseInstance::statusChanged, this, &InstanceWindow::on_instanceStatusChanged);
+	}
 	show();
 }
 
+void InstanceWindow::on_instanceStatusChanged(BaseInstance::Status, BaseInstance::Status newStatus)
+{
+	if(newStatus == BaseInstance::Status::Gone)
+	{
+		m_doNotSave = true;
+		close();
+	}
+}
+
 void InstanceWindow::setKillButton(bool kill)
 {
 	if(kill)
@@ -145,18 +159,25 @@ void InstanceWindow::on_closeButton_clicked()
 
 void InstanceWindow::closeEvent(QCloseEvent *event)
 {
+	bool proceed = true;
+	if(!m_doNotSave)
+	{
+		proceed &= m_container->requestClose(event);
+	}
+
+	if(!proceed)
+	{
+		return;
+	}
+
 	MMC->settings()->set("ConsoleWindowState", saveState().toBase64());
 	MMC->settings()->set("ConsoleWindowGeometry", saveGeometry().toBase64());
-
-	if(m_container->requestClose(event))
+	emit isClosing();
+	event->accept();
+	if(m_shouldQuit)
 	{
-		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);
-		}
+		// this needs to be delayed so we don't do horrible things
+		QMetaObject::invokeMethod(MMC, "quit", Qt::QueuedConnection);
 	}
 }