EnumPropertyEditor throws on ObjectSpaceOnCommitted #330 #341

eXpandFramework · Mar 12, 2019 · 37b4827 · 37b4827
1 parent 22bc9b1
commit 37b4827
Showing 1 changed file with 2 additions and 2 deletions.
diff --git 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);
         }
     }
 }