fix: GUI stops refreshing after manually refresh while merge tool is open (#949)

love-linger · love-linger · commit aebfffee0034 · 2025-02-10T20:51:36.000+08:00
Signed-off-by: leo &lt;longshuang@msn.cn&gt;
diff --git a/src/ViewModels/WorkingCopy.cs b/src/ViewModels/WorkingCopy.cs
@@ -431,10 +431,7 @@ public async void UseExternalMergeTool(Models.Change change)
         {
             var toolType = Preferences.Instance.ExternalMergeToolType;
             var toolPath = Preferences.Instance.ExternalMergeToolPath;
-
-            _repo.SetWatcherEnabled(false);
             await Task.Run(() => Commands.MergeTool.OpenForMerge(_repo.FullPath, toolType, toolPath, change.Path));
-            _repo.SetWatcherEnabled(true);
         }
 
         public void ContinueMerge()

Original file line number	Diff line number	Diff line change
`@@ -431,10 +431,7 @@ public async void UseExternalMergeTool(Models.Change change)`
`431`	`431`	`{`
`432`	`432`	`var toolType = Preferences.Instance.ExternalMergeToolType;`
`433`	`433`	`var toolPath = Preferences.Instance.ExternalMergeToolPath;`
`434`		`-`
`435`		`- _repo.SetWatcherEnabled(false);`
`436`	`434`	`await Task.Run(() => Commands.MergeTool.OpenForMerge(_repo.FullPath, toolType, toolPath, change.Path));`
`437`		`- _repo.SetWatcherEnabled(true);`
`438`	`435`	`}`
`439`	`436`
`440`	`437`	`public void ContinueMerge()`