Fix CollectionControlDialog control may cause 'System.ArgumentOutOfRangeException'

8 years ago · 6019e1fef4
2 changed files with 6 additions and 0 deletions
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/CollectionControl/Implementation/CollectionControlDialog.xaml.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/CollectionControl/Implementation/CollectionControlDialog.xaml.cs
@ -227,6 +227,9 @@ namespace Xceed.Wpf.Toolkit
      Debug.Assert( result != null );
      if( result != null )
      {
+        if (result is ICollection
+          && ((ICollection)result).Count == 0)
+          return result;
        var properties = sourceType.GetProperties();

        foreach( var propertyInfo in properties )
--- a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/CollectionControl/Implementation/CollectionControlDialog.xaml.cs
+++ b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/CollectionControl/Implementation/CollectionControlDialog.xaml.cs
@ -227,6 +227,9 @@ namespace Xceed.Wpf.Toolkit
      Debug.Assert( result != null );
      if( result != null )
      {
+        if (result is ICollection
+          && ((ICollection)result).Count == 0)
+          return result;
        var properties = sourceType.GetProperties();

        foreach( var propertyInfo in properties )