Merge branch 'master' into feature/OpenTypeFontSupport

7 years ago · 17e355ca7a
1 changed files with 5 additions and 2 deletions
--- a/src/Avalonia.Input/AccessKeyHandler.cs
+++ b/src/Avalonia.Input/AccessKeyHandler.cs
@ -234,8 +234,11 @@ namespace Avalonia.Input

                case Key.F10:
                    _owner.ShowAccessKeys = _showingAccessKeys = true;
-                    MainMenu.Open();
-                    e.Handled = true;
+                    if (MainMenu != null)
+                    {
+                        MainMenu.Open();
+                        e.Handled = true;
+                    }
                    break;
            }
        }