fixes

dotnet · May 16, 2024 · 18a2881 · 18a2881
1 parent 1a4f123
commit 18a2881
Showing 1 changed file with 9 additions and 9 deletions.
diff --git a/src/Controls/src/Xaml/MarkupExtensions/BindingExtension.cs b/src/Controls/src/Xaml/MarkupExtensions/BindingExtension.cs
@@ -21,22 +21,22 @@ public sealed class BindingExtension : IMarkupExtension<BindingBase>
 
 		BindingBase IMarkupExtension<BindingBase>.ProvideValue(IServiceProvider serviceProvider)
 		{
-			Type bindingXDataType = null;
-			if ((serviceProvider.GetService(typeof(IXamlTypeResolver)) is IXamlTypeResolver typeResolver)
-				&& (serviceProvider.GetService(typeof(IXamlDataTypeProvider)) is IXamlDataTypeProvider dataTypeProvider)
-				&& dataTypeProvider.BindingDataType != null)
-			{
-				typeResolver.TryResolve(dataTypeProvider.BindingDataType, out bindingXDataType);
-			}
-
-			if (TypedBinding == null)
+			if (TypedBinding is null) {
+				Type bindingXDataType = null;
+				if ((serviceProvider.GetService(typeof(IXamlTypeResolver)) is IXamlTypeResolver typeResolver)
+					&& (serviceProvider.GetService(typeof(IXamlDataTypeProvider)) is IXamlDataTypeProvider dataTypeProvider)
+					&& dataTypeProvider.BindingDataType != null)
+				{
+					typeResolver.TryResolve(dataTypeProvider.BindingDataType, out bindingXDataType);
+				}
 				return new Binding(Path, Mode, Converter, ConverterParameter, StringFormat, Source)
 				{
 					UpdateSourceEventName = UpdateSourceEventName,
 					FallbackValue = FallbackValue,
 					TargetNullValue = TargetNullValue,
 					DataType = bindingXDataType,
 				};
+			}
 
 			TypedBinding.Mode = Mode;
 			TypedBinding.Converter = Converter;