Skip to content

Code Quality: Avoid NullReferenceException in ToggleFilterHeaderAction #17651

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
Sep 18, 2025
Merged

Code Quality: Avoid NullReferenceException in ToggleFilterHeaderAction #17651

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
6ad080a
Fix: Avoid NullReferenceException in ToggleFilterHeaderAction
seer-by-sentry[bot] Sep 18, 2025
9e5632b
Merge branch 'main' into seer/fix/toggle-filter-header-nre
yaira2 Sep 18, 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
16 changes: 10 additions & 6 deletions src/Files.App/Actions/Show/ToggleFilterHeaderAction.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,12 +33,16 @@ public Task ExecuteAsync(object? parameter = null)
{
generalSettingsService.ShowFilterHeader = !IsOn;

if (IsOn)
ContentPageContext.ShellPage!.ShellViewModel.InvokeFocusFilterHeader();
else
ContentPageContext.ShellPage!.PaneHolder.FocusActivePane();

return Task.CompletedTask;
// Only attempt to focus if there's an active shell page
if (ContentPageContext.ShellPage is not null)
{
if (IsOn)
ContentPageContext.ShellPage.ShellViewModel.InvokeFocusFilterHeader();
else
ContentPageContext.ShellPage.PaneHolder.FocusActivePane();
}

return Task.CompletedTask;
}

private void GeneralSettingsService_PropertyChanged(object? sender, PropertyChangedEventArgs e)
Expand Down
Loading