Ver Fonte

Merge branch 'master' into fixes/FontMetrics

Jumar Macato há 5 anos atrás
pai
commit
f0b60be7e7
1 ficheiros alterados com 4 adições e 1 exclusões
  1. 4 1
      src/Avalonia.Input/KeyGesture.cs

+ 4 - 1
src/Avalonia.Input/KeyGesture.cs

@@ -144,7 +144,10 @@ namespace Avalonia.Input
             return s.ToString();
             return s.ToString();
         }
         }
 
 
-        public bool Matches(KeyEventArgs keyEvent) => ResolveNumPadOperationKey(keyEvent.Key) == Key && keyEvent.KeyModifiers == KeyModifiers;
+        public bool Matches(KeyEventArgs keyEvent) =>
+            keyEvent != null &&
+            keyEvent.KeyModifiers == KeyModifiers &&
+            ResolveNumPadOperationKey(keyEvent.Key) == ResolveNumPadOperationKey(Key);
 
 
         // TODO: Move that to external key parser
         // TODO: Move that to external key parser
         private static Key ParseKey(string key)
         private static Key ParseKey(string key)