From e40cab88ad406493688138307d10d93e702a6380 Mon Sep 17 00:00:00 2001
From: Roy-043 <info@b-k-g.nl>
Date: Sat, 30 Nov 2024 11:47:10 +0100
Subject: [PATCH] Draft: Fix finish behavior of Draft_Edit on doc close

Forum topic:
https://forum.freecad.org/viewtopic.php?p=794746#p794746
---
 src/Mod/Draft/draftguitools/gui_edit.py | 41 ++++++++++++++++---------
 1 file changed, 26 insertions(+), 15 deletions(-)

diff --git a/src/Mod/Draft/draftguitools/gui_edit.py b/src/Mod/Draft/draftguitools/gui_edit.py
index 86f08299ba..ff48b19db6 100644
--- a/src/Mod/Draft/draftguitools/gui_edit.py
+++ b/src/Mod/Draft/draftguitools/gui_edit.py
@@ -340,8 +340,11 @@ class Edit(gui_base_original.Modifier):
         self.running = False
         # delay resetting edit mode otherwise it doesn't happen
         from PySide import QtCore
-        QtCore.QTimer.singleShot(0, Gui.ActiveDocument.resetEdit)
+        QtCore.QTimer.singleShot(0, self.reset_edit)
 
+    def reset_edit(self):
+        if Gui.ActiveDocument is not None:
+            Gui.ActiveDocument.resetEdit()
 
     # -------------------------------------------------------------------------
     # SCENE EVENTS CALLBACKS
@@ -356,8 +359,12 @@ class Edit(gui_base_original.Modifier):
         """
         remove selection callback if it exists
         """
-        if self.selection_callback:
-            self.view.removeEventCallback("SoEvent", self.selection_callback)
+        try:
+            if self.selection_callback:
+                self.view.removeEventCallback("SoEvent", self.selection_callback)
+        except RuntimeError:
+            # the view has been deleted already
+            pass
         self.selection_callback = None
 
     def register_editing_callbacks(self):
@@ -380,18 +387,22 @@ class Edit(gui_base_original.Modifier):
         """
         remove callbacks used during editing if they exist
         """
-        if self._keyPressedCB:
-            self.view.removeEventCallbackSWIG(coin.SoKeyboardEvent.getClassTypeId(), self._keyPressedCB)
-            self._keyPressedCB = None
-            #App.Console.PrintMessage("Draft edit keyboard callback unregistered \n")
-        if self._mouseMovedCB:
-            self.view.removeEventCallbackSWIG(coin.SoLocation2Event.getClassTypeId(), self._mouseMovedCB)
-            self._mouseMovedCB = None
-            #App.Console.PrintMessage("Draft edit location callback unregistered \n")
-        if self._mousePressedCB:
-            self.view.removeEventCallbackSWIG(coin.SoMouseButtonEvent.getClassTypeId(), self._mousePressedCB)
-            self._mousePressedCB = None
-            #App.Console.PrintMessage("Draft edit mouse button callback unregistered \n")
+        try:
+            if self._keyPressedCB:
+                self.view.removeEventCallbackSWIG(coin.SoKeyboardEvent.getClassTypeId(), self._keyPressedCB)
+                #App.Console.PrintMessage("Draft edit keyboard callback unregistered \n")
+            if self._mouseMovedCB:
+                self.view.removeEventCallbackSWIG(coin.SoLocation2Event.getClassTypeId(), self._mouseMovedCB)
+                #App.Console.PrintMessage("Draft edit location callback unregistered \n")
+            if self._mousePressedCB:
+                self.view.removeEventCallbackSWIG(coin.SoMouseButtonEvent.getClassTypeId(), self._mousePressedCB)
+                #App.Console.PrintMessage("Draft edit mouse button callback unregistered \n")
+        except RuntimeError:
+            # the view has been deleted already
+            pass
+        self._keyPressedCB = None
+        self._mouseMovedCB = None
+        self._mousePressedCB = None
 
     # -------------------------------------------------------------------------
     # SCENE EVENT HANDLERS