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

fix: Custom Shell/Terminal or Diff/Merge Tool crash fix (#1484)

Browse Source 
* fix(1483): FilePickerOpenOptions Fix
* fix(1483): Missing Try Cath Block
This commit is contained in:
Enner Pérez
2025-07-01 21:25:38 -05:00
committed by GitHub
parent db5efbd3fa
commit 118894907e
1 changed files with 40 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

53
src/Views/Preferences.axaml.cs
View File

@@ -293,14 +293,28 @@ namespace SourceGit.Views
return;
var shell = Models.ShellOrTerminal.Supported[type];
var options = new FilePickerOpenOptions()
{
FileTypeFilter = [new FilePickerFileType(shell.Name) { Patterns = [shell.Exec] }],
AllowMultiple = false,
};
var selected = await StorageProvider.OpenFilePickerAsync(options);
if (selected.Count == 1)
var options = new FilePickerOpenOptions() { AllowMultiple = false };
if (shell.Name != "Custom")
{
options = new FilePickerOpenOptions()
{
FileTypeFilter = [new FilePickerFileType(shell.Name) { Patterns = [shell.Exec] }],
AllowMultiple = false,
};
}
IReadOnlyList<IStorageFile> selected = null;
try
{
selected = await StorageProvider.OpenFilePickerAsync(options);
}
catch (Exception ex)
{
App.RaiseException(string.Empty, $"Failed to select shell/terminal: {ex.Message}");
}
if (selected is { Count: 1 })
{
ViewModels.Preferences.Instance.ShellOrTerminalPath = selected[0].Path.LocalPath;
}
@@ -319,14 +333,27 @@ namespace SourceGit.Views
}
var tool = Models.ExternalMerger.Supported[type];
var options = new FilePickerOpenOptions()
var options = new FilePickerOpenOptions() { AllowMultiple = false };
if (tool.Name != "Custom")
{
FileTypeFilter = [new FilePickerFileType(tool.Name) { Patterns = tool.GetPatterns() }],
AllowMultiple = false,
};
options = new FilePickerOpenOptions()
{
FileTypeFilter = [new FilePickerFileType(tool.Name) { Patterns = tool.GetPatterns() }],
AllowMultiple = false,
};
}
var selected = await StorageProvider.OpenFilePickerAsync(options);
if (selected.Count == 1)
IReadOnlyList<IStorageFile> selected = null;
try
{
selected = await StorageProvider.OpenFilePickerAsync(options);
}
catch (Exception ex)
{
App.RaiseException(string.Empty, $"Failed to select merge tool: {ex.Message}");
}
if (selected is { Count: 1 })
{
ViewModels.Preferences.Instance.ExternalMergeToolPath = selected[0].Path.LocalPath;
}