WinGui: Fix a deadlock that can occur in the queue window when a stop…

… task is defined. HandBrake#4782
steven52880 · Dec 31, 2022 · f0cc281 · f0cc281
1 parent 77e3cd7
commit f0cc281
Showing 1 changed file with 12 additions and 10 deletions.
diff --git a/win/CS/HandBrakeWPF/Services/Queue/QueueService.cs b/win/CS/HandBrakeWPF/Services/Queue/QueueService.cs
@@ -142,8 +142,9 @@ public void Add(QueueTask job)
             lock (QueueLock)
             {
                 this.queue.Add(job);
-                this.InvokeQueueChanged(EventArgs.Empty);
             }
+
+            this.InvokeQueueChanged(EventArgs.Empty);
         }
 
         public void Add(List<QueueTask> tasks)
@@ -154,9 +155,9 @@ public void Add(List<QueueTask> tasks)
                 {
                     this.queue.Add(job);
                 }
-
-                this.InvokeQueueChanged(EventArgs.Empty);
             }
+
+            this.InvokeQueueChanged(EventArgs.Empty);
         }
 
         public void BackupQueue(string exportPath)
@@ -448,9 +449,9 @@ public void Remove(QueueTask job)
                 {
                     this.IsPaused = false;
                 }
-
-                this.InvokeQueueChanged(EventArgs.Empty);
             }
+
+            this.InvokeQueueChanged(EventArgs.Empty);
         }
 
         public void RestoreQueue(string importPath)
@@ -821,13 +822,14 @@ private void HandleBreakPoint(QueueTask task)
 
                 // Remove the Breakpoint
                 ThreadHelper.OnUIThread(() => this.queue.Remove(task));
+            }
 
-                this.IsProcessing = false;
-                this.IsPaused = false;
 
-                // Setting the flag will allow or prevent the when done actions to be processed. 
-                this.InvokeQueueCompleted(new QueueCompletedEventArgs(false)); 
-            }
+            this.IsProcessing = false;
+            this.IsPaused = false;
+
+            // Setting the flag will allow or prevent the when done actions to be processed. 
+            this.InvokeQueueCompleted(new QueueCompletedEventArgs(false));
         }
 
         private void RemoveBreakPoints()