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

2 files changed, 8 insertions, 2 deletions

diff --git a/win/C#/HandBrake.ApplicationServices/Services/Encode.cs b/win/C#/HandBrake.ApplicationServices/Services/Encode.cs
index 0e9465d18..4a6333da7 100644
--- 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);

 

                     this.HbProcess.CancelErrorRead();

-                    this.HbProcess.CancelOutputRead();

 

                     if (fileWriter != null)

                     {

diff --git a/win/C#/HandBrake.ApplicationServices/Services/QueueProcessor.cs b/win/C#/HandBrake.ApplicationServices/Services/QueueProcessor.cs
index ff865e2ee..130e1fc46 100644
--- 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",

                                          "Put down that cocktail...\nyour Handbrake encode is done.");

 

+            if (!e.Successful)

+            {

+                this.Pause();

+                MessageBox.Show(e.Exception + e.ErrorInformation);

+            }

+

             // Handling Log Data 

             this.EncodeService.ProcessLogs(this.QueueManager.LastProcessedJob.Destination);

 

@@ -209,9 +215,10 @@ namespace HandBrake.ApplicationServices.Services
         /// </summary>

         private void ProcessNextJob()

         {

-            if (this.EncodeService.IsEncoding)

+            if (this.EncodeService.IsEncoding || !this.IsProcessing)

             {

                 // We don't want to try start a second encode, so just return out. The event will trigger the next encode automatically.

+                // Also, we don't want to start a new encode if we are paused.

                 return;

             }