From e3d8da2cf13ad73cf38bbb4c42ca36bfa35b25d5 Mon Sep 17 00:00:00 2001
From: carlopav <carlopav@gmail.com>
Date: Wed, 6 Nov 2019 21:03:38 +0100
Subject: [PATCH] [Draft] Edit: fix bug #4187

Fix bug #4187. When canceling a Dwire editing session with the Esc key or the "close" button Dwire editing breaks.
---
 src/Mod/Draft/DraftEdit.py | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

diff --git a/src/Mod/Draft/DraftEdit.py b/src/Mod/Draft/DraftEdit.py
index c267b11303..a5a9a1cf70 100644
--- a/src/Mod/Draft/DraftEdit.py
+++ b/src/Mod/Draft/DraftEdit.py
@@ -159,8 +159,9 @@ class Edit():
         "terminates Edit Tool"
         self.unregister_selection_callback()
         self.unregister_editing_callbacks()
-        FreeCADGui.Snapper.setSelectMode(False)
+        self.editing = None
         self.finalizeGhost()
+        FreeCADGui.Snapper.setSelectMode(False)
         if self.obj and closed:
             if "Closed" in self.obj.PropertiesList:
                 if not self.obj.Closed:
@@ -245,11 +246,7 @@ class Edit():
             key = event.getKey()
             #FreeCAD.Console.PrintMessage("pressed key : "+str(key)+"\n")
             if key == 65307: # ESC
-                if self.editing is None: self.finish()
-                else:
-                    self.finalizeGhost()
-                    self.setEditPoints(self.obj)
-                    self.resetTrackers()
+                self.finish()
             if key == 97: # "a"
                 self.finish()
             if key == 111: # "o"