Fix: Fixed issue with browsing WSL drives (#11793)

files-community · Mar 22, 2023 · b428e71 · b428e71
1 parent 6ca26dc
commit b428e71
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 1 deletion.
diff --git a/src/Files.App/Filesystem/WSLDistroManager.cs b/src/Files.App/Filesystem/WSLDistroManager.cs
@@ -1,4 +1,5 @@
 using Files.App.DataModels.NavigationControlItems;
+using Files.App.Helpers;
 using System;
 using System.Collections.Generic;
 using System.Collections.Specialized;
@@ -59,6 +60,14 @@ public async Task UpdateDrivesAsync()
 			}
 		}
 
+		public bool TryGetDistro(string path, out WslDistroItem? distro)
+		{
+			var normalizedPath = PathNormalization.NormalizePath(path);
+			distro = Distros.FirstOrDefault(x => normalizedPath.StartsWith(PathNormalization.NormalizePath(x.Path), StringComparison.OrdinalIgnoreCase));
+
+			return distro is not null;
+		}
+
 		private static Uri GetLogoUri(string displayName)
 		{
 			if (Contains(displayName, "ubuntu"))

diff --git a/src/Files.App/ViewModels/ItemViewModel.cs b/src/Files.App/ViewModels/ItemViewModel.cs
@@ -1474,7 +1474,10 @@ public async Task<int> EnumerateItemsFromStandardFolderAsync(string path, Cancel
 		{
 			// Flag to use FindFirstFileExFromApp or StorageFolder enumeration - Use storage folder for Box Drive (#4629)
 			var isBoxFolder = App.CloudDrivesManager.Drives.FirstOrDefault(x => x.Text == "Box")?.Path?.TrimEnd('\\') is string boxFolder && path.StartsWith(boxFolder);
-			bool isNetwork = path.StartsWith(@"\\", StringComparison.Ordinal) && !path.StartsWith(@"\\?\", StringComparison.Ordinal);
+			bool isWslDistro = App.WSLDistroManager.TryGetDistro(path, out _);
+			bool isNetwork = path.StartsWith(@"\\", StringComparison.Ordinal) &&
+				!path.StartsWith(@"\\?\", StringComparison.Ordinal) &&
+				!isWslDistro;
 			bool enumFromStorageFolder = isBoxFolder;
 
 			BaseStorageFolder? rootFolder = null;