fix: closing alert shows in wrong condition

love-linger · love-linger · commit 738357b13b34 · 2026-01-28T15:53:07.000+08:00
Signed-off-by: leo &lt;longshuang@msn.cn&gt;
diff --git a/src/Views/MergeConflictEditor.axaml.cs b/src/Views/MergeConflictEditor.axaml.cs
@@ -680,7 +680,7 @@ protected override async void OnClosing(WindowClosingEventArgs e)
             if (DataContext is not ViewModels.MergeConflictEditor vm)
                 return;
 
-            if (_forceClose || vm.UnsolvedCount < vm.ConflictRegions.Count)
+            if (_forceClose || vm.UnsolvedCount == vm.ConflictRegions.Count)
             {
                 vm.PropertyChanged -= OnViewModelPropertyChanged;
                 return;

Original file line number	Diff line number	Diff line change
`@@ -680,7 +680,7 @@ protected override async void OnClosing(WindowClosingEventArgs e)`
`680`	`680`	`if (DataContext is not ViewModels.MergeConflictEditor vm)`
`681`	`681`	`return;`
`682`	`682`
`683`		`- if (_forceClose \|\| vm.UnsolvedCount < vm.ConflictRegions.Count)`
	`683`	`+ if (_forceClose \|\| vm.UnsolvedCount == vm.ConflictRegions.Count)`
`684`	`684`	`{`
`685`	`685`	`vm.PropertyChanged -= OnViewModelPropertyChanged;`
`686`	`686`	`return;`