From 131dc3720f82fea4b1391a83e022c3097a45d2d8 Mon Sep 17 00:00:00 2001
From: Dion Moult <dion@thinkmoult.com>
Date: Sun, 24 Feb 2019 19:38:12 +1100
Subject: [PATCH] If wires are merged, deleted, or otherwise had graph changing
 operations while edit mode is active, don't complain

---
 src/Mod/Draft/DraftTools.py | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/src/Mod/Draft/DraftTools.py b/src/Mod/Draft/DraftTools.py
index f8f07db8fd..59d67f18f0 100644
--- a/src/Mod/Draft/DraftTools.py
+++ b/src/Mod/Draft/DraftTools.py
@@ -4328,12 +4328,14 @@ class EditImproved(Modifier):
 
     def restore_editable_objects_graphics(self):
         for object in self.editable_objects:
-            if not object.Name:
-                continue
-            for attribute, value in self.original_view_settings[object.Name].items():
-                view_object = object.ViewObject
-                setattr(view_object, attribute, value)
-                view_object.RootNode.removeChild(view_object.RootNode.getByName("xray"))
+            try:
+                for attribute, value in self.original_view_settings[object.Name].items():
+                    view_object = object.ViewObject
+                    setattr(view_object, attribute, value)
+                    view_object.RootNode.removeChild(view_object.RootNode.getByName("xray"))
+            except:
+                # This can occur if objects have had graph changing operations
+                pass
 
 class Edit(Modifier):
     "The Draft_Edit FreeCAD command definition"