Browse Source

Make error clear when Source is not set on xaml include (#3788)

pull/9571/head
Max Katz 4 years ago
parent
commit
2e6fc86194
  1. 3
      src/Markup/Avalonia.Markup.Xaml/Styling/ResourceInclude.cs
  2. 3
      src/Markup/Avalonia.Markup.Xaml/Styling/StyleInclude.cs

3
src/Markup/Avalonia.Markup.Xaml/Styling/ResourceInclude.cs

@ -42,7 +42,8 @@ namespace Avalonia.Markup.Xaml.Styling
if (_loaded == null)
{
_isLoading = true;
_loaded = (IResourceDictionary)AvaloniaXamlLoader.Load(Source, _baseUri);
var source = Source ?? throw new InvalidOperationException("ResourceInclude.Source must be set.");
_loaded = (IResourceDictionary)AvaloniaXamlLoader.Load(source, _baseUri);
_isLoading = false;
}

3
src/Markup/Avalonia.Markup.Xaml/Styling/StyleInclude.cs

@ -51,7 +51,8 @@ namespace Avalonia.Markup.Xaml.Styling
if (_loaded == null)
{
_isLoading = true;
var loaded = (IStyle)AvaloniaXamlLoader.Load(Source, _baseUri);
var source = Source ?? throw new InvalidOperationException("StyleInclude.Source must be set.");
var loaded = (IStyle)AvaloniaXamlLoader.Load(source, _baseUri);
_loaded = new[] { loaded };
_isLoading = false;
}

Loading…
Cancel
Save