Skip to content

Commit c3a4f93

Browse files
hishitetsuyaira2
authored andcommitted
Fix: Fixed NullReferenceException in SetSelectedPathOrNavigate (#13923)
1 parent 5e83146 commit c3a4f93

File tree

2 files changed

+5
-5
lines changed

2 files changed

+5
-5
lines changed

src/Files.App/Views/LayoutModes/ColumnViewBrowser.xaml.cs

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -399,8 +399,7 @@ public void SetSelectedPathOrNavigate(PathNavigationEventArgs e)
399399
foreach (var item in ColumnHost.ActiveBlades)
400400
{
401401
if ((item.Content as Frame)?.Content is ColumnShellPage s &&
402-
PathNormalization.NormalizePath(s.FilesystemViewModel.WorkingDirectory) ==
403-
PathNormalization.NormalizePath(e.ItemPath))
402+
NormalizePath(s.FilesystemViewModel?.WorkingDirectory) == NormalizePath(e.ItemPath))
404403
{
405404
DismissOtherBlades(item);
406405
return;
@@ -411,8 +410,7 @@ public void SetSelectedPathOrNavigate(PathNavigationEventArgs e)
411410
if (ParentShellPageInstance is null)
412411
return;
413412

414-
if (NormalizePath(ParentShellPageInstance.FilesystemViewModel?.WorkingDirectory) !=
415-
NormalizePath(e.ItemPath))
413+
if (NormalizePath(ParentShellPageInstance.FilesystemViewModel?.WorkingDirectory) != NormalizePath(e.ItemPath))
416414
ParentShellPageInstance.NavigateToPath(e.ItemPath);
417415
else
418416
DismissOtherBlades(0);

src/Files.App/Views/Shells/ColumnShellPage.xaml.cs

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,9 @@ protected override void OnNavigatedTo(NavigationEventArgs eventArgs)
5656
}
5757

5858
protected override void ShellPage_NavigationRequested(object sender, PathNavigationEventArgs e)
59-
=> this.FindAscendant<ColumnViewBrowser>().SetSelectedPathOrNavigate(e);
59+
{
60+
this.FindAscendant<ColumnViewBrowser>()?.SetSelectedPathOrNavigate(e);
61+
}
6062

6163
protected override void OnNavigationParamsChanged()
6264
{

0 commit comments

Comments
 (0)