Gui: fix crash on closing document

Fixes #936
realthunder · Jan 18, 2024 · 09b8869 · 09b8869
1 parent 1c3b1f1
commit 09b8869
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 0 deletions.
diff --git a/src/Gui/ExpressionBinding.cpp b/src/Gui/ExpressionBinding.cpp
@@ -69,6 +69,7 @@ void ExpressionBinding::unbind()
 {
     expressionchanged.disconnect();
     objectdeleted.disconnect();
+    docClosed.disconnect();
     path = App::ObjectIdentifier();
 }
 
@@ -146,6 +147,13 @@ void ExpressionBinding::bind(const App::ObjectIdentifier &_path)
         expressionchanged = docObj->ExpressionEngine.expressionChanged.connect(boost::bind(&ExpressionBinding::expressionChange, this, bp::_1));
         App::Document* doc = docObj->getDocument();
         objectdeleted = doc->signalDeletedObject.connect(boost::bind(&ExpressionBinding::objectDeleted, this, bp::_1));
+        docClosed = App::GetApplication().signalDeleteDocument.connect(
+            [doc,this](const App::Document &docDelete) {
+                if (doc == &docDelete) {
+                    unbind();
+                }
+            });
+
     }
 }
 

diff --git a/src/Gui/ExpressionBinding.h b/src/Gui/ExpressionBinding.h
@@ -89,6 +89,7 @@ class GuiExport ExpressionBinding
     void objectDeleted(const App::DocumentObject&);
     boost::signals2::scoped_connection expressionchanged;
     boost::signals2::scoped_connection objectdeleted;
+    boost::signals2::scoped_connection docClosed;
     bool m_autoApply;
 };