File tree Expand file tree Collapse file tree 1 file changed +10
-6
lines changed
src/Files.App/Actions/Show Expand file tree Collapse file tree 1 file changed +10
-6
lines changed Original file line number Diff line number Diff 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 )
You can’t perform that action at this time.
0 commit comments