From 6db7687c7823831eec0992ba7ebd9d0be8cf0b39 Mon Sep 17 00:00:00 2001 From: Steven Kirk Date: Thu, 18 Aug 2016 23:15:14 +0200 Subject: [PATCH] Unpack AggregateException in TextBox. --- src/Avalonia.Controls/TextBox.cs | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/src/Avalonia.Controls/TextBox.cs b/src/Avalonia.Controls/TextBox.cs index 409e416680..5552d3d3c5 100644 --- a/src/Avalonia.Controls/TextBox.cs +++ b/src/Avalonia.Controls/TextBox.cs @@ -495,11 +495,17 @@ namespace Avalonia.Controls else { classes.Add(":error"); - DataValidationErrors = new[] { status.Error }; + DataValidationErrors = UnpackException(status.Error); } } } + private static IEnumerable UnpackException(Exception exception) + { + var aggregate = exception as AggregateException; + return aggregate == null ? Enumerable.Repeat(exception, 1) : aggregate.InnerExceptions; + } + private int CoerceCaretIndex(int value) { var text = Text;