Skip to content

Commit 5eb2297

Browse files
authored
Fix: Fixed NullReferenceException with SetSelectedPathOrNavigate (#13691)
1 parent 1493bab commit 5eb2297

File tree

1 file changed

+8
-8
lines changed

1 file changed

+8
-8
lines changed

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

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -115,7 +115,7 @@ protected override void OnNavigatedTo(NavigationEventArgs eventArgs)
115115
SearchUnindexedItems = navigationArguments.SearchUnindexedItems,
116116
SearchPathParam = navigationArguments.SearchPathParam,
117117
NavPathParam = path,
118-
SelectItems = path == navigationArguments.NavPathParam? navigationArguments.SelectItems : null
118+
SelectItems = path == navigationArguments.NavPathParam ? navigationArguments.SelectItems : null
119119
});
120120

121121
var index = 0;
@@ -127,7 +127,7 @@ protected override void OnNavigatedTo(NavigationEventArgs eventArgs)
127127
{
128128
Column = ++index,
129129
NavPathParam = path,
130-
SelectItems = path == navigationArguments.NavPathParam? navigationArguments.SelectItems : null
130+
SelectItems = path == navigationArguments.NavPathParam ? navigationArguments.SelectItems : null
131131
});
132132
}
133133
}
@@ -406,15 +406,15 @@ public void SetSelectedPathOrNavigate(PathNavigationEventArgs e)
406406
}
407407
}
408408
}
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))
412415
ParentShellPageInstance.NavigateToPath(e.ItemPath);
413-
}
414416
else
415-
{
416417
DismissOtherBlades(0);
417-
}
418418
}
419419

420420
public IShellPage ActiveColumnShellPage

0 commit comments

Comments
 (0)