WinGui: When Deleting a job, select the nearest or first item in the list to allow faster keyboard operations to manage the queue.

1 files changed, 10 insertions, 0 deletions

diff --git a/win/CS/HandBrakeWPF/ViewModels/QueueViewModel.cs b/win/CS/HandBrakeWPF/ViewModels/QueueViewModel.cs
index 42dc2fef4..9ff7e6b40 100644
--- a/win/CS/HandBrakeWPF/ViewModels/QueueViewModel.cs
+++ b/win/CS/HandBrakeWPF/ViewModels/QueueViewModel.cs
@@ -405,6 +405,9 @@ namespace HandBrakeWPF.ViewModels
                 return;

             }

 

+            bool removed = false;

+            int index = this.QueueTasks.IndexOf(task);

+

             if (task.Status == QueueItemStatus.InProgress)

             {

                 MessageBoxResult result =

@@ -418,11 +421,18 @@ namespace HandBrakeWPF.ViewModels
                 {

                     this.queueProcessor.EncodeService.Stop();

                     this.queueProcessor.Remove(task);

+                    removed = true;

                 }

             }

             else

             {

                 this.queueProcessor.Remove(task);

+                removed = true;

+            }

+

+            if (this.QueueTasks.Any() && removed)

+            {              

+                this.SelectedTask = index > 1 ? this.QueueTasks[index - 1] : this.QueueTasks.FirstOrDefault();

             }

         }