Fix sometimes props not loading

hez2010 · hez2010 · commit c6ca8249b439 · 2021-09-03T17:50:50.000+08:00
diff --git a/Files/ViewModels/ItemViewModel.cs b/Files/ViewModels/ItemViewModel.cs
@@ -906,7 +906,6 @@ public async Task LoadExtendedItemProperties(ListedItem item, uint thumbnailSize
                 return;
             }
 
-            item.ItemPropertiesInitialized = true;
             itemLoadQueue[item.ItemPath] = false;
 
             var cts = loadPropsCTS;
@@ -916,6 +915,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 +1045,7 @@ await FilesystemTasks.Wrap(() => CoreApplication.MainView.DispatcherQueue.Enqueu
             }
             catch (OperationCanceledException)
             {
-                item.ItemPropertiesInitialized = false;
+                // ignored
             }
             finally
             {

Original file line number	Diff line number	Diff line change
`@@ -906,7 +906,6 @@ public async Task LoadExtendedItemProperties(ListedItem item, uint thumbnailSize`
`906`	`906`	`return;`
`907`	`907`	`}`
`908`	`908`
`909`		`- item.ItemPropertiesInitialized = true;`
`910`	`909`	`itemLoadQueue[item.ItemPath] = false;`
`911`	`910`
`912`	`911`	`var cts = loadPropsCTS;`
`@@ -916,6 +915,7 @@ public async Task LoadExtendedItemProperties(ListedItem item, uint thumbnailSize`
`916`	`915`	`await Task.Run(async () =>`
`917`	`916`	`{`
`918`	`917`	`await itemLoadEvent.WaitAsync(cts.Token);`
	`918`	`+ item.ItemPropertiesInitialized = true;`
`919`	`919`
`920`	`920`	`if (itemLoadQueue.TryGetValue(item.ItemPath, out var canceled) && canceled)`
`921`	`921`	`{`
`@@ -1045,7 +1045,7 @@ await FilesystemTasks.Wrap(() => CoreApplication.MainView.DispatcherQueue.Enqueu`
`1045`	`1045`	`}`
`1046`	`1046`	`catch (OperationCanceledException)`
`1047`	`1047`	`{`
`1048`		`- item.ItemPropertiesInitialized = false;`
	`1048`	`+ // ignored`
`1049`	`1049`	`}`
`1050`	`1050`	`finally`
`1051`	`1051`	`{`