]> granicus.if.org Git - handbrake/commitdiff
WinGui: Fix a bug in queue recovery where old files were not deleted.
authorsr55 <sr55.hb@outlook.com>
Fri, 15 Jun 2018 19:00:31 +0000 (20:00 +0100)
committersr55 <sr55.hb@outlook.com>
Fri, 15 Jun 2018 19:01:11 +0000 (20:01 +0100)
win/CS/HandBrakeWPF/Helpers/QueueRecoveryHelper.cs

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