WinGui:

- Fix some issues with the log window repeating the log header.

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

diff --git a/win/C#/HandBrake.ApplicationServices/Services/Scan.cs b/win/C#/HandBrake.ApplicationServices/Services/Scan.cs
index da8d34f7cd34fa635a1a975f0e37e18707d85bc2..558dbb8a7b8f70afe8714218e725266da96569b1 100644 (file)
--- a/win/C#/HandBrake.ApplicationServices/Services/Scan.cs
+++ b/win/C#/HandBrake.ApplicationServices/Services/Scan.cs
@@ -94,7 +94,7 @@ namespace HandBrake.ApplicationServices.Services
 \r
                 if (logBuffer == null)\r
                 {\r
-                    ResetLogReader();\r
+                    ResetLogReader(false);\r
                     ReadLastScanFile();  \r
                 }\r
 \r
@@ -149,12 +149,12 @@ namespace HandBrake.ApplicationServices.Services
                 if (this.ScanStared != null)\r
                     this.ScanStared(this, new EventArgs());\r
 \r
-                ResetLogReader();\r
+                ResetLogReader(true);\r
 \r
                 string handbrakeCLIPath = Path.Combine(Application.StartupPath, "HandBrakeCLI.exe");\r
                 string logDir = Environment.GetFolderPath(Environment.SpecialFolder.ApplicationData) +\r
                                 "\\HandBrake\\logs";\r
-                string dvdInfoPath = Path.Combine(logDir, string.Format("last_scan_log{0}.txt", Init.InstanceId));\r
+                string dvdInfoPath = Path.Combine(logDir, string.Format("last_scan_log{0}.txt", Init.InstanceId == 0 ? string.Empty : Init.InstanceId.ToString()));\r
 \r
                 // Make we don't pick up a stale last_encode_log.txt (and that we have rights to the file)\r
                 if (File.Exists(dvdInfoPath))\r
@@ -219,8 +219,8 @@ namespace HandBrake.ApplicationServices.Services
                 // we'll need to make a copy of it.\r
                 string logDir = Environment.GetFolderPath(Environment.SpecialFolder.ApplicationData) +\r
                                 "\\HandBrake\\logs";\r
-                string logFile = Path.Combine(logDir, string.Format("last_scan_log{0}.txt", Init.InstanceId));\r
-                string logFile2 = Path.Combine(logDir, string.Format("tmp_appReadable_log{0}.txt", Init.InstanceId));\r
+                string logFile = Path.Combine(logDir, string.Format("last_scan_log{0}.txt", Init.InstanceId == 0 ? string.Empty : Init.InstanceId.ToString()));\r
+                string logFile2 = Path.Combine(logDir, string.Format("tmp_appReadable_log{0}.txt", Init.InstanceId == 0 ? string.Empty : Init.InstanceId.ToString()));\r
 \r
                 try\r
                 {\r
@@ -233,7 +233,7 @@ namespace HandBrake.ApplicationServices.Services
                         File.Copy(logFile, logFile2, true);\r
                     else\r
                     {\r
-                        ResetLogReader();\r
+                        ResetLogReader(true);\r
                         return;\r
                     }\r
 \r
@@ -257,7 +257,7 @@ namespace HandBrake.ApplicationServices.Services
                 catch (Exception exc)\r
                 {\r
                     Console.WriteLine(exc.ToString());\r
-                    ResetLogReader();\r
+                    ResetLogReader(true);\r
                 }\r
             }\r
         }\r
@@ -265,11 +265,15 @@ namespace HandBrake.ApplicationServices.Services
         /// <summary>\r
         /// Reset the Log Reader\r
         /// </summary>\r
-        private void ResetLogReader()\r
+        /// <param name="addHeader">\r
+        /// The add Header.\r
+        /// </param>\r
+        private void ResetLogReader(bool addHeader)\r
         {\r
             logFilePosition = 0;\r
             logBuffer = new StringBuilder();\r
-            logBuffer.AppendLine(Logging.CreateCliLogHeader(null));\r
+            if (addHeader)\r
+                logBuffer.AppendLine(Logging.CreateCliLogHeader(null));\r
         }\r
 \r
         /// <summary>\r

diff --git a/win/C#/frmActivityWindow.cs b/win/C#/frmActivityWindow.cs
index 62799e926a42a2f7f7bd53f0e122c4aec2b153bd..598851f78bfa24554eb2a19d57df298902d8cce6 100644 (file)
--- a/win/C#/frmActivityWindow.cs
+++ b/win/C#/frmActivityWindow.cs
@@ -199,6 +199,7 @@ namespace Handbrake
         private void stopWindowRefresh(object sender, EventArgs e)\r
         {\r
             windowTimer.Dispose();\r
+            Reset();\r
             LogMonitor(null);\r
         }\r
 \r