From b1a2aa29d870c9f370ab100d206b26e8d124c5eb Mon Sep 17 00:00:00 2001 From: Steven Kirk Date: Sat, 31 Oct 2015 16:58:07 +0100 Subject: [PATCH] Fix FuncMultiValueConverter. Only pass values to func if all values are of type TIn. --- src/Markup/Perspex.Markup/FuncMultiValueConverter.cs | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/src/Markup/Perspex.Markup/FuncMultiValueConverter.cs b/src/Markup/Perspex.Markup/FuncMultiValueConverter.cs index 11bb4fc079..b956512357 100644 --- a/src/Markup/Perspex.Markup/FuncMultiValueConverter.cs +++ b/src/Markup/Perspex.Markup/FuncMultiValueConverter.cs @@ -30,7 +30,16 @@ namespace Perspex.Markup /// public object Convert(IList values, Type targetType, object parameter, CultureInfo culture) { - return _convert(values.Cast()); + var converted = values.OfType().ToList(); + + if (converted.Count == values.Count) + { + return _convert(converted); + } + else + { + return PerspexProperty.UnsetValue; + } } } }