Merge pull request #5 from Barsonax/#583

#583: fix for enumpropertyeditor
AdamsLair · Oct 18, 2017 · dc59c94 · dc59c94
2 parents e4fb0f2 + 028d704
commit dc59c94
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/.gitignore b/.gitignore
@@ -12,6 +12,7 @@ TestResults
 *.suo
 *.user
 *.sln.docstates
+/.vs
 
 # Build results
 [Dd]ebug/

diff --git a/WinForms/PropertyEditing/PropertyEditors/EnumPropertyEditor.cs b/WinForms/PropertyEditing/PropertyEditors/EnumPropertyEditor.cs
@@ -55,7 +55,7 @@ protected override void OnGetValue()
 		{
 			base.OnGetValue();
 			this.BeginUpdate();
-			Enum[] values = this.GetValue().Select(o => o is Enum ? (Enum)o : null).ToArray();
+			Enum[] values = Enum.GetValues(EditedType).Cast<Enum>().ToArray();
 			IEnumerable<Enum> valuesNotNull = values.Where(o => o != null);
 
 			// Apply values to editors