WinGui: Misc UI fixes and fixes to the logging code for scanning that could sometimes cause a crash.

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

1 files changed, 13 insertions, 5 deletions

diff --git a/win/CS/HandBrake.ApplicationServices/Services/Scan/LibScan.cs b/win/CS/HandBrake.ApplicationServices/Services/Scan/LibScan.cs
index a560493ab..6e16fa937 100644
--- a/win/CS/HandBrake.ApplicationServices/Services/Scan/LibScan.cs
+++ b/win/CS/HandBrake.ApplicationServices/Services/Scan/LibScan.cs
@@ -168,8 +168,12 @@ namespace HandBrake.ApplicationServices.Services.Scan
             {

                 try

                 {

-                    this.scanLog.Close();

-                    this.scanLog.Dispose();

+                    lock (LogLock)

+                    {

+                        this.scanLog.Close();

+                        this.scanLog.Dispose();

+                        this.scanLog = null;

+                    }

                     this.instance.Dispose();

                 }

                 catch (Exception)

@@ -227,10 +231,14 @@ namespace HandBrake.ApplicationServices.Services.Scan
                 this.IsScanning = false;

                 this.instance.StopScan();

 

-                if (this.scanLog != null)

+                lock (LogLock)

                 {

-                    this.scanLog.Close();

-                    this.scanLog.Dispose();

+                    if (this.scanLog != null)

+                    {

+                        this.scanLog.Close();

+                        this.scanLog.Dispose();

+                        this.scanLog = null;

+                    }

                 }

             }

             catch (Exception)