From aebfffee003413b679ed7523c04c834764fe0a82 Mon Sep 17 00:00:00 2001 From: leo Date: Mon, 10 Feb 2025 20:51:36 +0800 Subject: [PATCH] fix: GUI stops refreshing after manually refresh while merge tool is open (#949) Signed-off-by: leo --- src/ViewModels/WorkingCopy.cs | 3 --- 1 file changed, 3 deletions(-) diff --git a/src/ViewModels/WorkingCopy.cs b/src/ViewModels/WorkingCopy.cs index ecb3c0d6..7ac13dc2 100644 --- a/src/ViewModels/WorkingCopy.cs +++ b/src/ViewModels/WorkingCopy.cs @@ -431,10 +431,7 @@ namespace SourceGit.ViewModels { 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()