Browse Source

only call SetMenu once OSX.

pull/3762/head
Dan Walmsley 6 years ago
parent
commit
230b4030ae
  1. 11
      src/Avalonia.Native/AvaloniaNativeMenuExporter.cs

11
src/Avalonia.Native/AvaloniaNativeMenuExporter.cs

@ -150,16 +150,23 @@ namespace Avalonia.Native
private void SetMenu(IAvnWindow avnWindow, NativeMenu menu) private void SetMenu(IAvnWindow avnWindow, NativeMenu menu)
{ {
var setMenu = false;
if (_nativeMenu is null) if (_nativeMenu is null)
{ {
_nativeMenu = IAvnMenu.Create(_factory, true); _nativeMenu = IAvnMenu.Create(_factory, true);
_nativeMenu.Initialise(this, menu, ""); _nativeMenu.Initialise(this, menu, "");
setMenu = true;
} }
_nativeMenu.Update(_factory, menu); _nativeMenu.Update(_factory, menu);
avnWindow.SetMainMenu(_nativeMenu); if(setMenu)
{
avnWindow.SetMainMenu(_nativeMenu);
}
} }
} }
} }

Loading…
Cancel
Save