fix(ui): open the merge modal non-modal so a running merge no longer blocks the main window

Co-Authored-By: Claude Sonnet 5.5 <noreply@anthropic.com>
2026-10-01 11:50:58 +02:00
parent 2b7b58be37
commit 3d74e3dac5
4 changed files with 58 additions and 10 deletions
@@ -149,11 +149,7 @@ public sealed class WindowDialogService : IDialogService
        if (Shell is { } shell)
        {
            vm.ResolveMergeVm = shell.ResolveMergeVm;
-            vm.ShowMergeAction = async mergeVm =>
-            {
-                var mergeDlg = new MergeModalView { DataContext = mergeVm };
-                await mergeDlg.ShowDialog(_owner);
-            };
+            vm.ShowMergeAction = mergeVm => MergeModalView.ShowAsync(_owner, mergeVm);
        }
        await dlg.ShowDialog(_owner);
    }