From b115733f3a3e898fb53690f8562872bc0e1fe9f5 Mon Sep 17 00:00:00 2001
From: sr55 <sr55.hb@outlook.com>
Date: Mon, 24 Sep 2018 21:07:56 +0100
Subject: [PATCH] WinGui: When Deleting a job, select the nearest or first item
 in the list to allow faster keyboard operations to manage the queue.

---
 win/CS/HandBrakeWPF/ViewModels/QueueViewModel.cs | 10 ++++++++++
 1 file changed, 10 insertions(+)

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();
             }
         }
 
-- 
2.40.0