From: sr55 <sr55.hb@outlook.com>
Date: Fri, 15 Jun 2018 19:00:31 +0000 (+0100)
Subject: WinGui: Fix a bug in queue recovery where old files were not deleted.
X-Git-Tag: 1.2.0~308
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=762b1cf321b7db4b7f58b36c88baa7714edabfc3;p=handbrake

WinGui: Fix a bug in queue recovery where old files were not deleted.
---

diff --git a/win/CS/HandBrakeWPF/Helpers/QueueRecoveryHelper.cs b/win/CS/HandBrakeWPF/Helpers/QueueRecoveryHelper.cs
index 657062fc0..cb17e2e41 100644
--- a/win/CS/HandBrakeWPF/Helpers/QueueRecoveryHelper.cs
+++ b/win/CS/HandBrakeWPF/Helpers/QueueRecoveryHelper.cs
@@ -36,6 +36,9 @@ namespace HandBrakeWPF.Helpers
         /// If it does, it means the last queue did not complete before HandBrake closed.
         /// So, return a boolean if true. 
         /// </summary>
+        /// <param name="filterQueueFiles">
+        /// The filter Queue Files.
+        /// </param>
         /// <returns>
         /// True if there is a queue to recover.
         /// </returns>
@@ -156,7 +159,7 @@ namespace HandBrakeWPF.Helpers
                     isRecovered = true;
 
                     // Cleanup
-                    CleanupFiles(new List<string> { Path.Combine(appDataPath, file) });                   
+                    CleanupFiles(new List<string> { file });                   
                 }
 
                 return isRecovered;
@@ -199,6 +202,8 @@ namespace HandBrakeWPF.Helpers
 
         private static void CleanupFiles(List<string> removeFiles)
         {
+            string appDataPath = DirectoryUtilities.GetUserStoragePath(VersionHelper.IsNightly());
+
             // Cleanup old/unused queue files for now.
             foreach (string file in removeFiles)
             {
@@ -212,7 +217,8 @@ namespace HandBrakeWPF.Helpers
                     }
                 }
 
-                File.Delete(file);
+                string fullPath = Path.Combine(appDataPath, file);
+                File.Delete(fullPath);
             }
         }
     }