From f83bb1b4c2f8a2dad8a11965e2db769c0bff2e4c Mon Sep 17 00:00:00 2001 From: Nikita Tsukanov Date: Sun, 5 May 2019 22:07:52 +0300 Subject: [PATCH] Actually show the uri to improve debugging experience --- .../Converters/AvaloniaUriTypeConverter.cs | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/src/Markup/Avalonia.Markup.Xaml/Converters/AvaloniaUriTypeConverter.cs b/src/Markup/Avalonia.Markup.Xaml/Converters/AvaloniaUriTypeConverter.cs index 6f6a0b8563..3c3a718213 100644 --- a/src/Markup/Avalonia.Markup.Xaml/Converters/AvaloniaUriTypeConverter.cs +++ b/src/Markup/Avalonia.Markup.Xaml/Converters/AvaloniaUriTypeConverter.cs @@ -17,9 +17,10 @@ namespace Avalonia.Markup.Xaml.Converters if (s == null) return null; //On Unix Uri tries to interpret paths starting with "/" as file Uris - if (s.StartsWith("/")) - return new Uri(s, UriKind.Relative); - return new Uri(s); + var kind = s.StartsWith("/") ? UriKind.Relative : UriKind.Absolute; + if (!Uri.TryCreate(s, kind, out var res)) + throw new ArgumentException("Unable to parse URI: " + s); + return res; } } }