From 7c37aa929b3bb9b996429552603ea56001223f8f Mon Sep 17 00:00:00 2001 From: Heku Date: Tue, 2 Jul 2024 05:40:25 +0800 Subject: [PATCH] Merge same case branches (#16182) --- src/Avalonia.Base/AvaloniaObject.cs | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/src/Avalonia.Base/AvaloniaObject.cs b/src/Avalonia.Base/AvaloniaObject.cs index 37457ad7c3..853d585232 100644 --- a/src/Avalonia.Base/AvaloniaObject.cs +++ b/src/Avalonia.Base/AvaloniaObject.cs @@ -818,11 +818,9 @@ namespace Avalonia var fallback = value.HasValue ? value : value.WithValue(property.GetUnsetValue(this)); property.InvokeSetter(this, fallback); break; - case BindingValueType.DataValidationError: - property.InvokeSetter(this, value); - break; case BindingValueType.Value: case BindingValueType.BindingErrorWithFallback: + case BindingValueType.DataValidationError: case BindingValueType.DataValidationErrorWithFallback: property.InvokeSetter(this, value); break;