github-mirrors/sourcegit
1
0
Fork 0
mirror of https://fastgit.cc/github.com/sourcegit-scm/sourcegit synced 2026-04-30 13:51:53 +08:00
Code Issues Packages Projects Releases Wiki Activity

feature<ExternalMergeTool>: use default path if file exists after tool changed

Browse Source
This commit is contained in:
leo
2024-02-19 16:19:12 +08:00
parent 1a27b1dfb1
commit e7219b4278
2 changed files with 13 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/ViewModels/Preference.cs
View File

@@ -123,7 +123,14 @@ namespace SourceGit.ViewModels {
public int ExternalMergeToolType {
get => _externalMergeToolType;
set => SetProperty(ref _externalMergeToolType, value);
set {
var changed = SetProperty(ref _externalMergeToolType, value);
if (changed && !OperatingSystem.IsWindows() && value >= 0 && value < Models.ExternalMergeTools.Supported.Count) {
var tool = Models.ExternalMergeTools.Supported[value];
if (File.Exists(tool.Exec)) ExternalMergeToolPath = tool.Exec;
else ExternalMergeToolPath = string.Empty;
}
}
}
public string ExternalMergeToolPath {