Browse Source

Fixed NRE in GetBaseUri/GetLocalAssembly

pull/1079/head
Nikita Tsukanov 9 years ago
parent
commit
ffc8e9f7a9
  1. 4
      src/Markup/Avalonia.Markup.Xaml/PortableXaml/TypeDescriptorExtensions.cs

4
src/Markup/Avalonia.Markup.Xaml/PortableXaml/TypeDescriptorExtensions.cs

@ -62,12 +62,12 @@ namespace Portable.Xaml.ComponentModel
public static Uri GetBaseUri(this ITypeDescriptorContext ctx) public static Uri GetBaseUri(this ITypeDescriptorContext ctx)
{ {
return ctx.GetWriterSettings()?.Context.BaseUri; return ctx.GetWriterSettings()?.Context?.BaseUri;
} }
public static Assembly GetLocalAssembly(this ITypeDescriptorContext ctx) public static Assembly GetLocalAssembly(this ITypeDescriptorContext ctx)
{ {
return ctx.GetWriterSettings()?.Context.LocalAssembly; return ctx.GetWriterSettings()?.Context?.LocalAssembly;
} }
public static AvaloniaXamlContext GetAvaloniaXamlContext(this ITypeDescriptorContext ctx) public static AvaloniaXamlContext GetAvaloniaXamlContext(this ITypeDescriptorContext ctx)

Loading…
Cancel
Save