dearwolf/sourcegit
1
0
Fork 0
mirror of https://github.com/sourcegit-scm/sourcegit synced 2025-05-21 12:15:00 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

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

Browse source 
Signed-off-by: leo <longshuang@msn.cn>
This commit is contained in:
leo 2025-02-10 20:51:36 +08:00
parent 0c8179b934
commit aebfffee00
No known key found for this signature in database
1 changed files with 0 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

3
src/ViewModels/WorkingCopy.cs
View file

@ -431,10 +431,7 @@ namespace SourceGit.ViewModels
{ {
var toolType = Preferences.Instance.ExternalMergeToolType; var toolType = Preferences.Instance.ExternalMergeToolType;
var toolPath = Preferences.Instance.ExternalMergeToolPath; var toolPath = Preferences.Instance.ExternalMergeToolPath;
_repo.SetWatcherEnabled(false);
await Task.Run(() => Commands.MergeTool.OpenForMerge(_repo.FullPath, toolType, toolPath, change.Path)); await Task.Run(() => Commands.MergeTool.OpenForMerge(_repo.FullPath, toolType, toolPath, change.Path));
_repo.SetWatcherEnabled(true);
} }
public void ContinueMerge() public void ContinueMerge()