WinGui:

- Fix an issue that was causing queue processing to crash out.

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

diff --git a/win/C#/HandBrake.ApplicationServices/Services/Encode.cs b/win/C#/HandBrake.ApplicationServices/Services/Encode.cs
index 0e9465d1854f155cd21bda8b07521568983a3515..4a6333da7d9c28a2759c76312c1417fc603702d9 100644 (file)
--- a/win/C#/HandBrake.ApplicationServices/Services/Encode.cs
+++ b/win/C#/HandBrake.ApplicationServices/Services/Encode.cs
@@ -376,7 +376,6 @@ namespace HandBrake.ApplicationServices.Services
                     Thread.Sleep(2500);\r
 \r
                     this.HbProcess.CancelErrorRead();\r
-                    this.HbProcess.CancelOutputRead();\r
 \r
                     if (fileWriter != null)\r
                     {\r

diff --git a/win/C#/HandBrake.ApplicationServices/Services/QueueProcessor.cs b/win/C#/HandBrake.ApplicationServices/Services/QueueProcessor.cs
index ff865e2ee42864899c8c16e9b6d6cd9fe03ea07a..130e1fc4685f640812605167382b759e916bcde5 100644 (file)
--- a/win/C#/HandBrake.ApplicationServices/Services/QueueProcessor.cs
+++ b/win/C#/HandBrake.ApplicationServices/Services/QueueProcessor.cs
@@ -197,6 +197,12 @@ namespace HandBrake.ApplicationServices.Services
                 GrowlCommunicator.Notify("Encode Completed",\r
                                          "Put down that cocktail...\nyour Handbrake encode is done.");\r
 \r
+            if (!e.Successful)\r
+            {\r
+                this.Pause();\r
+                MessageBox.Show(e.Exception + e.ErrorInformation);\r
+            }\r
+\r
             // Handling Log Data \r
             this.EncodeService.ProcessLogs(this.QueueManager.LastProcessedJob.Destination);\r
 \r
@@ -209,9 +215,10 @@ namespace HandBrake.ApplicationServices.Services
         /// </summary>\r
         private void ProcessNextJob()\r
         {\r
-            if (this.EncodeService.IsEncoding)\r
+            if (this.EncodeService.IsEncoding || !this.IsProcessing)\r
             {\r
                 // We don't want to try start a second encode, so just return out. The event will trigger the next encode automatically.\r
+                // Also, we don't want to start a new encode if we are paused.\r
                 return;\r
             }\r
 \r