From 37b48276f044f91d940f3b94b9483b994ae3d0f0 Mon Sep 17 00:00:00 2001
From: apobekiaris <apostolis.bekiaris@gmail.com>
Date: Tue, 12 Mar 2019 07:46:10 +0200
Subject: [PATCH] EnumPropertyEditor throws on ObjectSpaceOnCommitted #330 #341

---
 .../PropertyEditors/EnumPropertyEditor.cs                     | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Xpand/Xpand.ExpressApp/Xpand.ExpressApp.Win/PropertyEditors/EnumPropertyEditor.cs b/Xpand/Xpand.ExpressApp/Xpand.ExpressApp.Win/PropertyEditors/EnumPropertyEditor.cs
index 236050b685..6885c9dd4f 100644
--- a/Xpand/Xpand.ExpressApp/Xpand.ExpressApp.Win/PropertyEditors/EnumPropertyEditor.cs
+++ b/Xpand/Xpand.ExpressApp/Xpand.ExpressApp.Win/PropertyEditors/EnumPropertyEditor.cs
@@ -86,7 +86,7 @@ public EnumPropertyEditor(Type objectType, IModelMemberViewItem model)
         public override void BreakLinksToControl(bool unwireEventsOnly) {
             base.BreakLinksToControl(unwireEventsOnly);
             CurrentObjectChanged-=OnCurrentObjectChanged;
-            _objectSpace.Committed-=ObjectSpaceOnCommitted;
+            if (_objectSpace != null) _objectSpace.Committed -= ObjectSpaceOnCommitted;
         }
 
         bool IsNoneValue(object value) {
@@ -112,7 +112,7 @@ public EnumPropertyEditor(Type objectType, IModelMemberViewItem model)
         }
 
         private void ObjectSpaceOnCommitted(object sender, EventArgs e) {
-            FilterRepositoryItem((RepositoryItemEnumEdit) Control.Properties);
+            if (Control != null) FilterRepositoryItem((RepositoryItemEnumEdit) Control.Properties);
         }
     }
 }
\ No newline at end of file