allow setting submenu to null.

6 years ago · 5765c869c5
1 changed files with 10 additions and 3 deletions
--- a/native/Avalonia.Native/src/OSX/menu.mm
+++ b/native/Avalonia.Native/src/OSX/menu.mm
@ -67,9 +67,16 @@ NSMenuItem* AvnAppMenuItem::GetNative()

 HRESULT AvnAppMenuItem::SetSubMenu (IAvnAppMenu* menu)
 {
-    auto nsMenu = dynamic_cast<AvnAppMenu*>(menu)->GetNative();
-    
-    [_native setSubmenu: nsMenu];
+    if(menu != nullptr)
+    {
+        auto nsMenu = dynamic_cast<AvnAppMenu*>(menu)->GetNative();
+        
+        [_native setSubmenu: nsMenu];
+    }
+    else
+    {
+        [_native setSubmenu: nullptr];
+    }
    
    return S_OK;
 }