WinGui:

- Picture Settings: Height of 0 allows for no -l to be passed to the CLI
- Picture Settings / pre-sets now set 0 when no Height specified. Prevents the panel from using incorrect values when pre-sets are selected.
- Simplified the Encode.cs set-up. Includes changes to QueueHandler

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

1 files changed, 7 insertions, 5 deletions

diff --git a/win/C#/frmPreview.cs b/win/C#/frmPreview.cs
index f38ee5c99..f2356ae60 100644
--- a/win/C#/frmPreview.cs
+++ b/win/C#/frmPreview.cs
@@ -19,7 +19,6 @@ namespace Handbrake
         private delegate void UpdateUIHandler();

         String currently_playing = "";

         readonly frmMain mainWindow;

-        private Process hbProc;

         private Thread player;

         private Boolean noQT;

 

@@ -84,13 +83,16 @@ namespace Handbrake
         private void procMonitor(object state)

         {

             // Make sure we are not already encoding and if we are then display an error.

-            if (hbProc != null)

+            if (process.hbProcess != null)

                 MessageBox.Show(this, "Handbrake is already encoding a video!", "Status", MessageBoxButtons.OK, MessageBoxIcon.Warning);

             else

             {

-                hbProc = process.runCli((string)state).hbProcProcess;

-                hbProc.WaitForExit();

-                hbProc = null;

+                process.runCli((string)state);

+                if (process.hbProcess != null)

+                {

+                    process.hbProcess.WaitForExit();

+                    process.hbProcess = null;

+                }

                 encodeCompleted();

             }

         }