WinGui:

- Add some additional exception handling to allow debugging of random crashing in the activity window.

git-svn-id: svn://localhost/HandBrake/trunk@3518 b64f7644-9d1e-0410-96f1-a4d463321fa5

diff --git a/win/C#/frmActivityWindow.cs b/win/C#/frmActivityWindow.cs
index 598851f..78c7927 100644 (file)
--- a/win/C#/frmActivityWindow.cs
+++ b/win/C#/frmActivityWindow.cs
@@ -13,6 +13,7 @@ namespace Handbrake
     using System.Threading;\r
     using System.Windows.Forms;\r
 \r
+    using HandBrake.ApplicationServices.Services;\r
     using HandBrake.ApplicationServices.Services.Interfaces;\r
 \r
     using Model;\r
@@ -26,24 +27,29 @@ namespace Handbrake
         /* Private Variables */\r
 \r
         /// <summary>\r
-        /// The current position in the log file\r
+        /// The Encode Object\r
         /// </summary>\r
-        private int position;\r
+        private readonly IQueue encode;\r
 \r
         /// <summary>\r
-        /// A Timer for this window\r
+        /// The Scan Object\r
         /// </summary>\r
-        private Timer windowTimer;\r
+        private readonly IScan scan;\r
 \r
         /// <summary>\r
-        /// The Encode Object\r
+        /// The Error service\r
         /// </summary>\r
-        private IQueue encode;\r
+        private readonly IErrorService errorService = new ErrorService();\r
 \r
         /// <summary>\r
-        /// The Scan Object\r
+        /// The current position in the log file\r
+        /// </summary>\r
+        private int position;\r
+\r
+        /// <summary>\r
+        /// A Timer for this window\r
         /// </summary>\r
-        private IScan scan;\r
+        private Timer windowTimer;\r
 \r
         /// <summary>\r
         /// The Type of log that the window is currently dealing with\r
@@ -111,7 +117,7 @@ namespace Handbrake
             {\r
                 if (rtf_actLog.InvokeRequired)\r
                 {\r
-                    IAsyncResult invoked = BeginInvoke(new SetModeCallback(SetMode), new object[] {setMode});\r
+                    IAsyncResult invoked = BeginInvoke(new SetModeCallback(SetMode), new object[] { setMode });\r
                     EndInvoke(invoked);\r
                 }\r
                 else\r
@@ -120,7 +126,7 @@ namespace Handbrake
                     this.mode = setMode;\r
 \r
                     Array values = Enum.GetValues(typeof(ActivityLogMode));\r
-                    Properties.Settings.Default.ActivityWindowLastMode = (int) values.GetValue(Convert.ToInt32(setMode));\r
+                    Properties.Settings.Default.ActivityWindowLastMode = (int)values.GetValue(Convert.ToInt32(setMode));\r
                     Properties.Settings.Default.Save();\r
 \r
                     this.Text = mode == ActivityLogMode.Scan\r
@@ -155,8 +161,15 @@ namespace Handbrake
         /// </param>\r
         private void NewActivityWindow_Load(object sender, EventArgs e)\r
         {\r
-            ActivityLogMode activitLogMode = (ActivityLogMode) Enum.ToObject(typeof(ActivityLogMode), Properties.Settings.Default.ActivityWindowLastMode);\r
-            SetMode(activitLogMode);        \r
+            try\r
+            {\r
+                ActivityLogMode activitLogMode = (ActivityLogMode)Enum.ToObject(typeof(ActivityLogMode), Properties.Settings.Default.ActivityWindowLastMode);\r
+                SetMode(activitLogMode);\r
+            }\r
+            catch (Exception exc)\r
+            {\r
+                errorService.ShowError("Error during load.", exc.ToString());\r
+            }\r
         }\r
 \r
         /// <summary>\r
@@ -224,36 +237,44 @@ namespace Handbrake
         {\r
             StringBuilder appendText = new StringBuilder();\r
 \r
-            if (this.mode == ActivityLogMode.Scan)\r
+            try\r
             {\r
-                if (scan == null || scan.ActivityLog == string.Empty)\r
+                if (this.mode == ActivityLogMode.Scan)\r
                 {\r
-                    appendText.AppendFormat("Waiting for the log to be generated ...\n");\r
-                    position = 0;\r
-                    ClearWindowText();\r
-                    return appendText;\r
-                }\r
+                    if (scan == null || scan.ActivityLog == string.Empty)\r
+                    {\r
+                        appendText.AppendFormat("Waiting for the log to be generated ...\n");\r
+                        position = 0;\r
+                        ClearWindowText();\r
+                        return appendText;\r
+                    }\r
 \r
-                using (StringReader reader = new StringReader(scan.ActivityLog))\r
-                {\r
-                    LogReader(reader, appendText);\r
+                    using (StringReader reader = new StringReader(scan.ActivityLog))\r
+                    {\r
+                        LogReader(reader, appendText);\r
+                    }\r
                 }\r
-            }\r
-            else\r
-            {\r
-                if (encode == null || encode.ActivityLog == string.Empty)\r
+                else\r
                 {\r
-                    appendText.AppendFormat("Waiting for the log to be generated ...\n");\r
-                    position = 0;\r
-                    ClearWindowText();\r
-                    return appendText;\r
-                }\r
+                    if (encode == null || encode.ActivityLog == string.Empty)\r
+                    {\r
+                        appendText.AppendFormat("Waiting for the log to be generated ...\n");\r
+                        position = 0;\r
+                        ClearWindowText();\r
+                        return appendText;\r
+                    }\r
 \r
-                using (StringReader reader = new StringReader(encode.ActivityLog))\r
-                {\r
-                    LogReader(reader, appendText);\r
+                    using (StringReader reader = new StringReader(encode.ActivityLog))\r
+                    {\r
+                        LogReader(reader, appendText);\r
+                    }\r
                 }\r
             }\r
+            catch (Exception exc)\r
+            {\r
+                errorService.ShowError("GetLog() Error", exc.ToString());\r
+            }\r
+\r
             return appendText;\r
         }\r
 \r