chore: improve error reporting

unoplatform · Dec 6, 2023 · a436cf5 · a436cf5
1 parent 01f8223
commit a436cf5
Showing 1 changed file with 9 additions and 2 deletions.
diff --git a/src/Uno.UI.Runtime.Skia.Wpf/Input/WpfKeyboardInputSource.cs b/src/Uno.UI.Runtime.Skia.Wpf/Input/WpfKeyboardInputSource.cs
@@ -96,13 +96,20 @@ private static uint GetScanCode(KeyEventArgs args)
 	{
 		try
 		{
-			return (uint)((int)(typeof(KeyEventArgs).GetProperty("ScanCode", BindingFlags.Public | BindingFlags.NonPublic | BindingFlags.Instance)?.GetValue(args) ?? 0));
+			if (typeof(KeyEventArgs).GetProperty("ScanCode", BindingFlags.Public | BindingFlags.NonPublic | BindingFlags.Instance) is { } propertyInfo)
+			{
+				return (uint)(int)propertyInfo.GetValue(args)!;
+			}
+			else
+			{
+				throw new PlatformNotSupportedException("Unable to get the ScanCode property from WPF. This likely means this WPF version is not compatible with Uno Platform, contact the developers for more information.");
+			}
 		}
 		catch (Exception e)
 		{
 			if (typeof(WpfKeyboardInputSource).Log().IsEnabled(LogLevel.Error))
 			{
-				typeof(WpfKeyboardInputSource).Log().LogError("Couldn't get ScanCode from WPF KeyEventArgs.", e);
+				typeof(WpfKeyboardInputSource).Log().LogError("Unable to get ScanCode from WPF KeyEventArgs.", e);
 			}
 
 			throw;