From 1914a3cab25ab337e3ec4d6de3c5581312ace74a Mon Sep 17 00:00:00 2001 From: Gadfly Date: Sun, 29 Sep 2024 14:42:53 +0800 Subject: [PATCH] fix: avoid NRE in ContextMenuExtension --- src/Views/ContextMenuExtension.cs | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/src/Views/ContextMenuExtension.cs b/src/Views/ContextMenuExtension.cs index 6e6dbf20..35a624b6 100644 --- a/src/Views/ContextMenuExtension.cs +++ b/src/Views/ContextMenuExtension.cs @@ -1,6 +1,6 @@ using System.ComponentModel; - using Avalonia.Controls; +using Avalonia.Threading; namespace SourceGit.Views { @@ -15,7 +15,10 @@ namespace SourceGit.Views menu.Closing += OnContextMenuClosing; // Clear context menu because it is dynamic. control.ContextMenu = menu; - control.ContextMenu.Open(); + Dispatcher.UIThread.InvokeAsync(() => + { + control.ContextMenu?.Open(); + }); } private static void OnContextMenuClosing(object sender, CancelEventArgs e)