From c29603f132e11c825407c6cb645a8b596e7a82dd Mon Sep 17 00:00:00 2001
From: Dan Walmsley <dan@walms.co.uk>
Date: Fri, 27 Sep 2019 14:12:29 +0100
Subject: [PATCH] [osx] fix responding to updates on app menu

---
 native/Avalonia.Native/src/OSX/menu.mm | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/native/Avalonia.Native/src/OSX/menu.mm b/native/Avalonia.Native/src/OSX/menu.mm
index 416aa12ab1..cdd6dd6c78 100644
--- a/native/Avalonia.Native/src/OSX/menu.mm
+++ b/native/Avalonia.Native/src/OSX/menu.mm
@@ -219,10 +219,18 @@ extern void SetAppMenu (NSString* appName, IAvnAppMenu* menu)
         
         auto currentMenu = [s_appMenuItem menu];
         
-        [currentMenu removeItem:s_appMenuItem];
+        if (currentMenu != nullptr)
+        {
+            [currentMenu removeItem:s_appMenuItem];
+        }
         
         s_appMenuItem = [nativeMenu->GetNative() itemAtIndex:0];
         
+        if (currentMenu == nullptr)
+        {
+            currentMenu = [s_appMenuItem menu];
+        }
+        
         [[s_appMenuItem menu] removeItem:s_appMenuItem];
         
         [currentMenu insertItem:s_appMenuItem atIndex:0];