fix(claude-do): merge Make the merge modal non-modal so a running merge no longer

ClaudeDo-Task: b2b4c74fc265435b9f083f56d0e47546
2026-10-01 11:52:40 +02:00
parent 488c28a9d5 3d74e3dac5
commit 61105ff9d3
4 changed files with 58 additions and 10 deletions
@@ -165,12 +165,12 @@ public partial class DetailsIslandView : UserControl
                return System.Threading.Tasks.Task.CompletedTask;
            };

-            vm.Merge.ShowMergeModal = async (mergeVm) =>
+            // Non-modal so the main window stays usable while the merge + verify runs; the task
+            // completes on close so the diff viewer can still react to the outcome.
+            vm.Merge.ShowMergeModal = (mergeVm) =>
            {
                var owner = TopLevel.GetTopLevel(this) as Window;
-                if (owner == null) return;
-                var modal = new MergeModalView { DataContext = mergeVm };
-                await modal.ShowDialog(owner);
+                return owner == null ? System.Threading.Tasks.Task.CompletedTask : MergeModalView.ShowAsync(owner, mergeVm);
            };

        }