Updated CanExecuteChanged in NativeMenuItem.cs to thunk to the UI thr…

…ead if it ends up running on a non-UI thread.
AvaloniaUI · Jun 13, 2024 · c71d999 · c71d999
1 parent b17729d
commit c71d999
Showing 1 changed file with 5 additions and 1 deletion.
diff --git a/src/Avalonia.Controls/NativeMenuItem.cs b/src/Avalonia.Controls/NativeMenuItem.cs
@@ -5,6 +5,7 @@
 using Avalonia.Input;
 using Avalonia.Media.Imaging;
 using Avalonia.Metadata;
+using Avalonia.Threading;
 using Avalonia.Utilities;
 
 namespace Avalonia.Controls
@@ -164,7 +165,10 @@ public bool IsVisible
 
         void CanExecuteChanged()
         {
-            SetCurrentValue(IsEnabledProperty, Command?.CanExecute(CommandParameter) ?? true);
+            if (!Dispatcher.UIThread.CheckAccess())
+                Dispatcher.UIThread.Invoke(() => CanExecuteChanged());
+            else
+                SetCurrentValue(IsEnabledProperty, Command?.CanExecute(CommandParameter) ?? true);
         }
 
         public bool HasClickHandlers => Click != null;