Fixed NRE in GetBaseUri/GetLocalAssembly

9 years ago · ffc8e9f7a9
1 changed files with 2 additions and 2 deletions
--- a/src/Markup/Avalonia.Markup.Xaml/PortableXaml/TypeDescriptorExtensions.cs
+++ b/src/Markup/Avalonia.Markup.Xaml/PortableXaml/TypeDescriptorExtensions.cs
@ -62,12 +62,12 @@ namespace Portable.Xaml.ComponentModel

        public static Uri GetBaseUri(this ITypeDescriptorContext ctx)
        {
-            return ctx.GetWriterSettings()?.Context.BaseUri;
+            return ctx.GetWriterSettings()?.Context?.BaseUri;
        }

        public static Assembly GetLocalAssembly(this ITypeDescriptorContext ctx)
        {
-            return ctx.GetWriterSettings()?.Context.LocalAssembly;
+            return ctx.GetWriterSettings()?.Context?.LocalAssembly;
        }

        public static AvaloniaXamlContext GetAvaloniaXamlContext(this ITypeDescriptorContext ctx)