Skip to content

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

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Jul 2, 2025
Merged

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

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b43465d
fix(1483): FilePickerOpenOptions Fix
ennerperez Jul 1, 2025
9735705
fix(1483): Missing Try Cath Block
ennerperez Jul 1, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
51 changes: 39 additions & 12 deletions src/Views/Preferences.axaml.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -293,14 +293,28 @@ private async void SelectShellOrTerminal(object _, RoutedEventArgs e)
return;

var shell = Models.ShellOrTerminal.Supported[type];
var options = new FilePickerOpenOptions()

var options = new FilePickerOpenOptions() { AllowMultiple = false };
if (shell.Name != "Custom")
{
FileTypeFilter = [new FilePickerFileType(shell.Name) { Patterns = [shell.Exec] }],
AllowMultiple = false,
};
options = new FilePickerOpenOptions()
{
FileTypeFilter = [new FilePickerFileType(shell.Name) { Patterns = [shell.Exec] }],
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 shell/terminal: {ex.Message}");
}

if (selected is { Count: 1 })
{
ViewModels.Preferences.Instance.ShellOrTerminalPath = selected[0].Path.LocalPath;
}
Expand All @@ -319,14 +333,27 @@ private async void SelectExternalMergeTool(object _, RoutedEventArgs e)
}

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;
}
Expand Down