Fix issue where pendingTasks collection is modified while enumerated

luberda-molinet · Jun 10, 2016 · 394f3e9 · 394f3e9
1 parent 01de443
commit 394f3e9
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/source/FFImageLoading.Common/Work/WorkScheduler.cs b/source/FFImageLoading.Common/Work/WorkScheduler.cs
@@ -116,7 +116,7 @@ public void SetPauseWork(bool pauseWork)
 
                 lock (_pendingTasksLock)
                 {
-                    foreach (var task in _pendingTasks)
+                    foreach (var task in _pendingTasks.ToList()) // FMT: here we need a copy since cancelling will trigger them to be removed, hence collection is modified during enumeration
                         task.ImageLoadingTask.Cancel();
 
                     _pendingTasks.Clear();
@@ -203,7 +203,7 @@ private async Task LoadImageAsync(IImageLoaderTask task)
             {
                 lock (_pendingTasksLock)
                 {
-                    foreach (var pendingTask in _pendingTasks)
+                    foreach (var pendingTask in _pendingTasks.ToList()) // FMT: here we need a copy since cancelling will trigger them to be removed, hence collection is modified during enumeration
                     {
                         if (pendingTask.ImageLoadingTask != null && pendingTask.ImageLoadingTask.UsesSameNativeControl(task))
                             pendingTask.ImageLoadingTask.CancelIfNeeded();