Fix: Fixed issue where the tab sometimes had the wrong icon

src/Files.App/Filesystem/Cloud/CloudDrivesManager.cs

@@ -1,19 +1,10 @@
 // Copyright (c) 2023 Files Community
 // Licensed under the MIT License. See the LICENSE.
 
-using CommunityToolkit.Mvvm.DependencyInjection;
-using CommunityToolkit.WinUI;
 using Files.App.DataModels.NavigationControlItems;
-using Files.App.Extensions;
-using Files.App.Helpers;
-using Files.Shared;
 using Files.Shared.Cloud;
 using Microsoft.Extensions.Logging;
-using System;
-using System.Collections.Generic;
 using System.Collections.Specialized;
-using System.Linq;
-using System.Threading.Tasks;
 using Windows.Storage;
 
 namespace Files.App.Filesystem.Cloud

src/Files.App/Filesystem/WSLDistroManager.cs

@@ -2,12 +2,8 @@
 // Licensed under the MIT License. See the LICENSE.
 
 using Files.App.DataModels.NavigationControlItems;
-using Files.App.Helpers;
-using System;
-using System.Collections.Generic;
 using System.Collections.Specialized;
-using System.Linq;
-using System.Threading.Tasks;
+using System.Diagnostics.CodeAnalysis;
 using Windows.Storage;
 using static Files.App.Constants;
 
@@ -63,7 +59,7 @@ public async Task UpdateDrivesAsync()
 			}
 		}
 
-		public bool TryGetDistro(string path, out WslDistroItem? distro)
+		public bool TryGetDistro(string path, [NotNullWhen(true)] out WslDistroItem? distro)
 		{
 			var normalizedPath = PathNormalization.NormalizePath(path);
 			distro = Distros.FirstOrDefault(x => normalizedPath.StartsWith(PathNormalization.NormalizePath(x.Path), StringComparison.OrdinalIgnoreCase));

src/Files.App/ViewModels/MainPageViewModel.cs

@@ -224,12 +224,18 @@ public async Task UpdateTabInfo(TabItem tabItem, object navigationArg)
 				// If localized string is empty use the library name.
 				tabLocationHeader = string.IsNullOrEmpty(libName) ? library.Text : libName;
 			}
+			else if (App.WSLDistroManager.TryGetDistro(currentPath, out WslDistroItem? wslDistro) && currentPath.Equals(wslDistro.Path))
+			{
+				tabLocationHeader = wslDistro.Text;
+				iconSource.ImageSource = new Microsoft.UI.Xaml.Media.Imaging.BitmapImage(wslDistro.Logo);
+			}
 			else
 			{
 				var normalizedCurrentPath = PathNormalization.NormalizePath(currentPath);
 				var matchingCloudDrive = App.CloudDrivesManager.Drives.FirstOrDefault(x => normalizedCurrentPath.Equals(PathNormalization.NormalizePath(x.Path), StringComparison.OrdinalIgnoreCase));
 				if (matchingCloudDrive is not null)
 				{
+					iconSource.ImageSource = matchingCloudDrive.Icon;
 					tabLocationHeader = matchingCloudDrive.Text;
 				}
 				else if (PathNormalization.NormalizePath(PathNormalization.GetPathRoot(currentPath)) == normalizedCurrentPath) // If path is a drive's root