From 230b4030aec98f331df86c53d3a2452cb862a36b Mon Sep 17 00:00:00 2001 From: Dan Walmsley Date: Mon, 27 Apr 2020 15:44:41 -0300 Subject: [PATCH] only call SetMenu once OSX. --- src/Avalonia.Native/AvaloniaNativeMenuExporter.cs | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/src/Avalonia.Native/AvaloniaNativeMenuExporter.cs b/src/Avalonia.Native/AvaloniaNativeMenuExporter.cs index 2b682b37c2..1e488505d6 100644 --- a/src/Avalonia.Native/AvaloniaNativeMenuExporter.cs +++ b/src/Avalonia.Native/AvaloniaNativeMenuExporter.cs @@ -150,16 +150,23 @@ namespace Avalonia.Native private void SetMenu(IAvnWindow avnWindow, NativeMenu menu) { + var setMenu = false; + if (_nativeMenu is null) { _nativeMenu = IAvnMenu.Create(_factory, true); - _nativeMenu.Initialise(this, menu, ""); + _nativeMenu.Initialise(this, menu, ""); + + setMenu = true; } _nativeMenu.Update(_factory, menu); - avnWindow.SetMainMenu(_nativeMenu); + if(setMenu) + { + avnWindow.SetMainMenu(_nativeMenu); + } } } }