WinGui:

- Fix an exception if the ActivityWindow was not initialised before the first scan.

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

1 files changed, 4 insertions, 2 deletions

diff --git a/win/C#/frmMain.cs b/win/C#/frmMain.cs
index 413847d51..9059701a5 100644
--- a/win/C#/frmMain.cs
+++ b/win/C#/frmMain.cs
@@ -715,7 +715,8 @@ namespace Handbrake
                             queueWindow.Show(false);

 

                         setEncodeStarted(); // Encode is running, so setup the GUI appropriately

-                        ActivityWindow.setLogView(false);

+                        if (ActivityWindow != null)

+                            ActivityWindow.setLogView(false);

                         encodeQueue.StartEncodeQueue(); // Start The Queue Encoding Process

                         lastAction = "encode";   // Set the last action to encode - Used for activity window.

                     }

@@ -1390,7 +1391,8 @@ namespace Handbrake
             {

                 lbl_encode.Visible = true;

                 lbl_encode.Text = "Scanning...";

-                ActivityWindow.setLogView(true);

+                if (ActivityWindow != null)

+                    ActivityWindow.setLogView(true);

                 isScanning = true;

                 ThreadPool.QueueUserWorkItem(scanProcess, filename);

             }