WinGui:

- Switch over to the new queue processor service. Please report any bugs found in the queue system. It may be a bit buggy until all the kinks are worked out

git-svn-id: svn://svn.handbrake.fr/HandBrake/trunk@3745 b64f7644-9d1e-0410-96f1-a4d463321fa5

1 files changed, 6 insertions, 5 deletions

diff --git a/win/C#/Functions/Main.cs b/win/C#/Functions/Main.cs
index 8f7cea326..d2d7ff5e5 100644
--- a/win/C#/Functions/Main.cs
+++ b/win/C#/Functions/Main.cs
@@ -421,8 +421,10 @@ namespace Handbrake.Functions
         /// <param name="encodeQueue">

         /// The encode Queue.

         /// </param>

-        public static void RecoverQueue(IQueue encodeQueue)

+        public static void RecoverQueue(IQueueProcessor encodeQueue)

         {

+            string appDataPath = Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.ApplicationData), @"HandBrake\");

+

             DialogResult result = DialogResult.None;

             List<string> queueFiles = CheckQueueRecovery();

             if (queueFiles.Count == 1)

@@ -442,18 +444,17 @@ namespace Handbrake.Functions
             {

                 foreach (string file in queueFiles)

                 {

-                    encodeQueue.LoadQueueFromFile(file); // Start Recovery

+                    encodeQueue.QueueManager.RestoreQueue(appDataPath + file); // Start Recovery

                 }

             }

             else

             {

                 if (IsMultiInstance) return; // Don't tamper with the files if we are multi instance

 

-                string tempPath = Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.ApplicationData), @"HandBrake\");

                 foreach (string file in queueFiles)

                 {

-                    if (File.Exists(Path.Combine(tempPath, file)))

-                        File.Delete(Path.Combine(tempPath, file));

+                    if (File.Exists(Path.Combine(appDataPath, file)))

+                        File.Delete(Path.Combine(appDataPath, file));

                 }

             }

         }