Fix: Fixed freeze when opening a shell folder in the columns layout (#13793)

hishitetsu · web-flow · commit 8c017612500b · 2023-11-10T09:51:58.000-05:00
diff --git a/src/Files.App/Views/LayoutModes/ColumnViewBrowser.xaml.cs b/src/Files.App/Views/LayoutModes/ColumnViewBrowser.xaml.cs
@@ -88,13 +88,14 @@ protected override void OnNavigatedTo(NavigationEventArgs eventArgs)
 			base.OnNavigatedTo(eventArgs);
 
 			var path = navigationArguments.NavPathParam;
+			var pathRoot = GetPathRoot(path);
 			var pathStack = new Stack<string>();
 
-			if (path is not null)
+			if (!string.IsNullOrEmpty(pathRoot))
 			{
 				var rootPathList = App.QuickAccessManager.Model.FavoriteItems.Select(NormalizePath)
 					.Concat(App.CloudDrivesManager.Drives.Select(x => NormalizePath(x.Path))).ToList();
-				rootPathList.Add(NormalizePath(GetPathRoot(path)));
+				rootPathList.Add(NormalizePath(pathRoot));
 
 				while (!rootPathList.Contains(NormalizePath(path)))
 				{

Original file line number	Diff line number	Diff line change
`@@ -88,13 +88,14 @@ protected override void OnNavigatedTo(NavigationEventArgs eventArgs)`
`88`	`88`	`base.OnNavigatedTo(eventArgs);`
`89`	`89`
`90`	`90`	`var path = navigationArguments.NavPathParam;`
	`91`	`+ var pathRoot = GetPathRoot(path);`
`91`	`92`	`var pathStack = new Stack<string>();`
`92`	`93`
`93`		`- if (path is not null)`
	`94`	`+ if (!string.IsNullOrEmpty(pathRoot))`
`94`	`95`	`{`
`95`	`96`	`var rootPathList = App.QuickAccessManager.Model.FavoriteItems.Select(NormalizePath)`
`96`	`97`	`.Concat(App.CloudDrivesManager.Drives.Select(x => NormalizePath(x.Path))).ToList();`
`97`		`- rootPathList.Add(NormalizePath(GetPathRoot(path)));`
	`98`	`+ rootPathList.Add(NormalizePath(pathRoot));`
`98`	`99`
`99`	`100`	`while (!rootPathList.Contains(NormalizePath(path)))`
`100`	`101`	`{`