Skip to content

Commit a87929d

Browse files
Code Quality: Avoid NullReferenceException in ToggleFilterHeaderAction (#17651)
Co-authored-by: seer-by-sentry[bot] <157164994+seer-by-sentry[bot]@users.noreply.github.com> Co-authored-by: Yair <[email protected]>
1 parent 6319362 commit a87929d

File tree

1 file changed

+10
-6
lines changed

1 file changed

+10
-6
lines changed

src/Files.App/Actions/Show/ToggleFilterHeaderAction.cs

Lines changed: 10 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -33,12 +33,16 @@ public Task ExecuteAsync(object? parameter = null)
3333
{
3434
generalSettingsService.ShowFilterHeader = !IsOn;
3535

36-
if (IsOn)
37-
ContentPageContext.ShellPage!.ShellViewModel.InvokeFocusFilterHeader();
38-
else
39-
ContentPageContext.ShellPage!.PaneHolder.FocusActivePane();
40-
41-
return Task.CompletedTask;
36+
// Only attempt to focus if there's an active shell page
37+
if (ContentPageContext.ShellPage is not null)
38+
{
39+
if (IsOn)
40+
ContentPageContext.ShellPage.ShellViewModel.InvokeFocusFilterHeader();
41+
else
42+
ContentPageContext.ShellPage.PaneHolder.FocusActivePane();
43+
}
44+
45+
return Task.CompletedTask;
4246
}
4347

4448
private void GeneralSettingsService_PropertyChanged(object? sender, PropertyChangedEventArgs e)

0 commit comments

Comments
 (0)