michael/sourcegit
1
0
Fork 0
mirror of https://github.com/sourcegit-scm/sourcegit.git synced 2024-12-24 20:57:19 -08:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

fix<ExternalMergeTool>: ignore type change on serialization

Browse source
This commit is contained in:
leo 2024-02-19 16:25:50 +08:00
parent e7219b4278
commit df16622335
1 changed files with 1 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/ViewModels/Preference.cs
View file

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