Fix: Fixed issue where placeholders used the thumbnail instead of the…

… icon (#14607) Co-authored-by: hishitetsu <[email protected]>
files-community · Feb 1, 2024 · 681b2d3 · 681b2d3
1 parent 30aa166
commit 681b2d3
Show file tree

Hide file tree

Showing 2 changed files with 24 additions and 11 deletions.
diff --git a/src/Files.App/Data/Models/ItemViewModel.cs b/src/Files.App/Data/Models/ItemViewModel.cs
@@ -1,7 +1,6 @@
 // Copyright (c) 2023 Files Community
 // Licensed under the MIT License. See the LICENSE.
 
-using Files.App.ViewModels.Previews;
 using Files.Core.Services.SizeProvider;
 using Files.Shared.Helpers;
 using LibGit2Sharp;
@@ -909,9 +908,9 @@ public async Task GetDefaultItemIconsAsync(uint size)
 			if (currentDefaultIconSize == size)
 				return;
 
-			// TODO: Add more than just the folder icon
 			DefaultIcons.Clear();
 
+			// TODO: Add more than just the folder icon
 			using StorageItemThumbnail icon = await FilesystemTasks.Wrap(() => StorageItemIconHelpers.GetIconForItemType(size, IconPersistenceOptions.Persist));
 			if (icon is not null)
 			{
@@ -947,7 +946,7 @@ private async Task LoadItemThumbnailAsync(ListedItem item, uint thumbnailSize =
 
 				if (!iconInfo.isIconCached)
 				{
-					// Display icon while trying to load cached thumbnail
+					// Assign a placeholder icon while trying to get a cached thumbnail
 					if (iconInfo.IconData is not null)
 					{
 						await dispatcherQueue.EnqueueOrInvokeAsync(async () =>
@@ -970,18 +969,29 @@ await dispatcherQueue.EnqueueOrInvokeAsync(async () =>
 				{
 					await dispatcherQueue.EnqueueOrInvokeAsync(async () =>
 					{
+						// Assign the thumbnail/icon to the listed item
 						item.FileImage = await iconInfo.IconData.ToBitmapAsync();
-						if (!string.IsNullOrEmpty(item.FileExtension) &&
-							!item.IsShortcut && !item.IsExecutable &&
-							!ImagePreviewViewModel.ContainsExtension(item.FileExtension.ToLowerInvariant()))
+
+						// Add the file icon to the DefaultIcons list
+						if
+						(
+							!DefaultIcons.ContainsKey(item.FileExtension.ToLowerInvariant()) && 
+							!string.IsNullOrEmpty(item.FileExtension) &&
+							!item.IsShortcut &&
+							!item.IsExecutable
+						)
 						{
-							DefaultIcons.AddIfNotPresent(item.FileExtension.ToLowerInvariant(), item.FileImage);
+							var fileIcon = await FileThumbnailHelper.LoadIconAndOverlayAsync(item.ItemPath, thumbnailSize, false, true);
+							var bitmapImage = await fileIcon.IconData.ToBitmapAsync();
+							DefaultIcons.TryAdd(item.FileExtension.ToLowerInvariant(), bitmapImage);
 						}
+
 					}, Microsoft.UI.Dispatching.DispatcherQueuePriority.Low);
 				}
 
 				if (iconInfo.OverlayData is not null)
 				{
+					// Assign the icon overlay to the listed item
 					await dispatcherQueue.EnqueueOrInvokeAsync(async () =>
 					{
 						item.IconOverlay = await iconInfo.OverlayData.ToBitmapAsync();
@@ -993,7 +1003,7 @@ await dispatcherQueue.EnqueueOrInvokeAsync(async () =>
 			{
 				var getIconOnly = UserSettingsService.FoldersSettingsService.ShowThumbnails == false || thumbnailSize < 80;
 				var iconInfo = await FileThumbnailHelper.LoadIconAndOverlayAsync(item.ItemPath, thumbnailSize, true, getIconOnly);
-				
+
 				if (iconInfo.IconData is not null)
 				{
 					await dispatcherQueue.EnqueueOrInvokeAsync(async () =>

diff --git a/src/Files.App/ViewModels/UserControls/InfoPaneViewModel.cs b/src/Files.App/ViewModels/UserControls/InfoPaneViewModel.cs
@@ -129,9 +129,12 @@ private void ContentPageContext_PropertyChanged(object? sender, PropertyChangedE
 					else
 						SelectedItem = null;
 
-					var shouldUpdatePreview = ((MainWindow.Instance.Content as Frame)?.Content as MainPage)?.ViewModel.ShouldPreviewPaneBeActive;
-					if (shouldUpdatePreview == true)
-						_ = UpdateSelectedItemPreviewAsync();
+					if (!App.AppModel.IsMainWindowClosed)
+					{
+						var shouldUpdatePreview = ((MainWindow.Instance.Content as Frame)?.Content as MainPage)?.ViewModel.ShouldPreviewPaneBeActive;
+						if (shouldUpdatePreview == true)
+							_ = UpdateSelectedItemPreviewAsync();
+					}
 					break;
 			}
 		}