Minor fixes

files-community · Sep 3, 2021 · 23cb6e4 · 23cb6e4
1 parent 37433fe
commit 23cb6e4
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/Files/Helpers/AsyncManualResetEvent.cs b/Files/Helpers/AsyncManualResetEvent.cs
@@ -33,7 +33,6 @@ public Task<bool> WaitAsync(int milliseconds, CancellationToken cancellationToke
             cancellationToken.Register(
                 s => ((TaskCompletionSource<bool>)s).TrySetCanceled(), tcs);
 
-
             return Task.WhenAny(m_tcs.Task, Delay(milliseconds)).Result;
         }
 

diff --git a/Files/ViewModels/ItemViewModel.cs b/Files/ViewModels/ItemViewModel.cs
@@ -909,11 +909,13 @@ public async Task LoadExtendedItemProperties(ListedItem item, uint thumbnailSize
             item.ItemPropertiesInitialized = true;
             itemLoadQueue[item.ItemPath] = false;
 
+            var cts = loadPropsCTS;
+
             try
             {
                 await Task.Run(async () =>
                 {
-                    await loadPropsEvent.WaitAsync(loadPropsCTS.Token);
+                    await loadPropsEvent.WaitAsync(cts.Token);
 
                     if (itemLoadQueue.TryGetValue(item.ItemPath, out var canceled) && canceled)
                     {
@@ -1039,7 +1041,7 @@ await FilesystemTasks.Wrap(() => CoreApplication.MainView.DispatcherQueue.Enqueu
                             }));
                         }
                     }
-                }, loadPropsCTS.Token);
+                }, cts.Token);
             }
             catch (OperationCanceledException)
             {
-Original file line number
+Diff line change
@@ Expand Up @@
                 cancellationToken.Register(
                     s => ((TaskCompletionSource<bool>)s).TrySetCanceled(), tcs);
                 return Task.WhenAny(m_tcs.Task, Delay(milliseconds)).Result;
             }
@@ Expand Down @@