From 6019e1fef4502b59e6e798fe88899506259fda6e Mon Sep 17 00:00:00 2001 From: ZhangPeng Date: Tue, 29 May 2018 17:26:00 +0800 Subject: [PATCH] Fix CollectionControlDialog control may cause 'System.ArgumentOutOfRangeException' --- .../Implementation/CollectionControlDialog.xaml.cs | 3 +++ .../Implementation/CollectionControlDialog.xaml.cs | 3 +++ 2 files changed, 6 insertions(+) diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/CollectionControl/Implementation/CollectionControlDialog.xaml.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/CollectionControl/Implementation/CollectionControlDialog.xaml.cs index 486b29db..c3eb15b8 100644 --- 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 ) diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/CollectionControl/Implementation/CollectionControlDialog.xaml.cs b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/CollectionControl/Implementation/CollectionControlDialog.xaml.cs index 486b29db..c3eb15b8 100644 --- 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 )