From f23b1a672d8cc33f3e8a73ab103901b5cbab1123 Mon Sep 17 00:00:00 2001 From: Tom Daffin Date: Wed, 24 Oct 2018 05:23:15 -0600 Subject: [PATCH 1/2] Fix a crash when pressing F10 on a window that has no main menu --- src/Avalonia.Input/AccessKeyHandler.cs | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/Avalonia.Input/AccessKeyHandler.cs b/src/Avalonia.Input/AccessKeyHandler.cs index b36e145d44..d80acbcd34 100644 --- a/src/Avalonia.Input/AccessKeyHandler.cs +++ b/src/Avalonia.Input/AccessKeyHandler.cs @@ -234,8 +234,10 @@ namespace Avalonia.Input case Key.F10: _owner.ShowAccessKeys = _showingAccessKeys = true; - MainMenu.Open(); - e.Handled = true; + if (MainMenu != null){ + MainMenu.Open(); + e.Handled = true; + } break; } } From 1fff6937301d1f932d94ebe6c4d5631ee1b049a6 Mon Sep 17 00:00:00 2001 From: Tom Daffin Date: Sun, 28 Oct 2018 19:21:08 -0600 Subject: [PATCH 2/2] Fix brace style --- src/Avalonia.Input/AccessKeyHandler.cs | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/Avalonia.Input/AccessKeyHandler.cs b/src/Avalonia.Input/AccessKeyHandler.cs index d80acbcd34..29768513f3 100644 --- a/src/Avalonia.Input/AccessKeyHandler.cs +++ b/src/Avalonia.Input/AccessKeyHandler.cs @@ -234,7 +234,8 @@ namespace Avalonia.Input case Key.F10: _owner.ShowAccessKeys = _showingAccessKeys = true; - if (MainMenu != null){ + if (MainMenu != null) + { MainMenu.Open(); e.Handled = true; }