Prevent twice entrance

files-community · Sep 3, 2021 · 2dcd11a · 2dcd11a
1 parent e579722
commit 2dcd11a
Showing 1 changed file with 7 additions and 2 deletions.
diff --git a/Files/ViewModels/ItemViewModel.cs b/Files/ViewModels/ItemViewModel.cs
@@ -906,7 +906,11 @@ public async Task LoadExtendedItemProperties(ListedItem item, uint thumbnailSize
                 return;
             }
 
-            item.ItemPropertiesInitialized = true;
+            if (itemLoadQueue.ContainsKey(item.ItemPath))
+            {
+                return;
+            }
+
             itemLoadQueue[item.ItemPath] = false;
 
             var cts = loadPropsCTS;
@@ -916,6 +920,7 @@ public async Task LoadExtendedItemProperties(ListedItem item, uint thumbnailSize
                 await Task.Run(async () =>
                 {
                     await itemLoadEvent.WaitAsync(cts.Token);
+                    item.ItemPropertiesInitialized = true;
 
                     if (itemLoadQueue.TryGetValue(item.ItemPath, out var canceled) && canceled)
                     {
@@ -1045,7 +1050,7 @@ await FilesystemTasks.Wrap(() => CoreApplication.MainView.DispatcherQueue.Enqueu
             }
             catch (OperationCanceledException)
             {
-                item.ItemPropertiesInitialized = false;
+                // ignored
             }
             finally
             {