File tree Expand file tree Collapse file tree 1 file changed +8
-8
lines changed
src/Files.App/Views/LayoutModes Expand file tree Collapse file tree 1 file changed +8
-8
lines changed Original file line number Diff line number Diff line change @@ -115,7 +115,7 @@ protected override void OnNavigatedTo(NavigationEventArgs eventArgs)
115
115
SearchUnindexedItems = navigationArguments . SearchUnindexedItems ,
116
116
SearchPathParam = navigationArguments . SearchPathParam ,
117
117
NavPathParam = path ,
118
- SelectItems = path == navigationArguments . NavPathParam ? navigationArguments . SelectItems : null
118
+ SelectItems = path == navigationArguments . NavPathParam ? navigationArguments . SelectItems : null
119
119
} ) ;
120
120
121
121
var index = 0 ;
@@ -127,7 +127,7 @@ protected override void OnNavigatedTo(NavigationEventArgs eventArgs)
127
127
{
128
128
Column = ++ index ,
129
129
NavPathParam = path ,
130
- SelectItems = path == navigationArguments . NavPathParam ? navigationArguments . SelectItems : null
130
+ SelectItems = path == navigationArguments . NavPathParam ? navigationArguments . SelectItems : null
131
131
} ) ;
132
132
}
133
133
}
@@ -406,15 +406,15 @@ public void SetSelectedPathOrNavigate(PathNavigationEventArgs e)
406
406
}
407
407
}
408
408
}
409
- if ( PathNormalization . NormalizePath ( ParentShellPageInstance . FilesystemViewModel . WorkingDirectory ) !=
410
- PathNormalization . NormalizePath ( e . ItemPath ) )
411
- {
409
+
410
+ if ( ParentShellPageInstance is null )
411
+ return ;
412
+
413
+ if ( NormalizePath ( ParentShellPageInstance . FilesystemViewModel . WorkingDirectory ) !=
414
+ NormalizePath ( e . ItemPath ) )
412
415
ParentShellPageInstance . NavigateToPath ( e . ItemPath ) ;
413
- }
414
416
else
415
- {
416
417
DismissOtherBlades ( 0 ) ;
417
- }
418
418
}
419
419
420
420
public IShellPage ActiveColumnShellPage
You can’t perform that action at this time.
0 commit comments