WinGui:

[handbrake-jp/handbrake-jp-git.git] / win / C# / Program.cs

diff --git a/win/C#/Program.cs b/win/C#/Program.cs
index ff91746..c147542 100644 (file)
--- a/win/C#/Program.cs
+++ b/win/C#/Program.cs
@@ -7,6 +7,7 @@ namespace Handbrake
 {\r
     using System;\r
     using System.Diagnostics;\r
+    using System.Drawing;\r
     using System.IO;\r
     using System.Windows.Forms;\r
 \r
@@ -32,20 +33,18 @@ namespace Handbrake
             InstanceId = Process.GetProcessesByName("HandBrake").Length;\r
 \r
             // Handle any unhandled exceptions\r
-            AppDomain.CurrentDomain.UnhandledException += new UnhandledExceptionEventHandler(CurrentDomain_UnhandledException);\r
+            AppDomain.CurrentDomain.UnhandledException += new UnhandledExceptionEventHandler(CurrentDomainUnhandledException);\r
 \r
             // Attempt to upgrade / keep the users settings between versions\r
             if (Settings.Default.UpdateRequired)\r
             {\r
                 Settings.Default.Upgrade();\r
                 Settings.Default.UpdateRequired = false;\r
+                Functions.Main.SetCliVersionData();\r
             }\r
 \r
             // Make sure we have any pre-requesits before trying to launch\r
-            const string FailedInstall = "HandBrake is not installed properly. Please reinstall HandBrake. \n\n";\r
-            const string NightlyCLIMissing =\r
-                "If you have downloaded the \"HandBrakeGUI\" nightly, " +\r
-                "please make sure you have also downloaded the \"HandBrakeCLI\" nightly and extracted it's contents to the same folder. ";\r
+            string failedInstall = "HandBrake is not installed properly. Please reinstall HandBrake. \n\n";\r
             string missingFiles = string.Empty;\r
 \r
             // Verify HandBrakeCLI.exe exists\r
@@ -57,7 +56,7 @@ namespace Handbrake
             if (missingFiles != string.Empty)\r
             {\r
                 MessageBox.Show(\r
-                    FailedInstall + missingFiles + "\n\n" + NightlyCLIMissing,\r
+                    failedInstall + missingFiles,\r
                     "Error",\r
                     MessageBoxButtons.OK,\r
                     MessageBoxIcon.Error);\r
@@ -67,7 +66,15 @@ namespace Handbrake
             // Check were not running on a screen that's going to cause some funnies to happen.\r
             Screen scr = Screen.PrimaryScreen;\r
             if ((scr.Bounds.Width < 1024) || (scr.Bounds.Height < 620))\r
-                MessageBox.Show("Your system does not meet the minimum requirements for HandBrake. \n" + "Your screen is running at: " + scr.Bounds.Width + "x" + scr.Bounds.Height + " \nScreen resolution is too Low. Must be 1024x620 or greater", "Error", MessageBoxButtons.OK, MessageBoxIcon.Error);\r
+            {\r
+                MessageBox.Show(\r
+                    "Your system does not meet the minimum requirements for HandBrake. \n" +\r
+                    "Your screen is running at: " + scr.Bounds.Width + "x" + scr.Bounds.Height +\r
+                    " \nScreen resolution is too Low. Must be 1024x620 or greater.\n\n",\r
+                    "Error",\r
+                    MessageBoxButtons.OK,\r
+                    MessageBoxIcon.Error);\r
+            } \r
             else\r
             {\r
                 string logDir = Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.ApplicationData), @"HandBrake\logs");\r
@@ -105,22 +112,13 @@ namespace Handbrake
         /// </summary>\r
         /// <param name="sender">The sender</param>\r
         /// <param name="e">Unhandled Exception EventArgs </param>\r
-        private static void CurrentDomain_UnhandledException(object sender, UnhandledExceptionEventArgs e)\r
+        private static void CurrentDomainUnhandledException(object sender, UnhandledExceptionEventArgs e)\r
         {\r
-            try\r
-            {\r
-                frmExceptionWindow exceptionWindow = new frmExceptionWindow();\r
-                exceptionWindow.Setup("An Unknown Error has occured.", e.ExceptionObject.ToString());\r
-                exceptionWindow.ShowDialog();\r
-            }\r
-            catch (Exception)\r
-            {\r
-                MessageBox.Show(\r
-                    "An Unknown Error has occured. \n\n Exception:" + e.ExceptionObject,\r
-                    "Unhandled Exception",\r
-                    MessageBoxButtons.OK,\r
-                    MessageBoxIcon.Error);\r
-            }\r
+            MessageBox.Show(\r
+                "An Unknown Error has occured. \n\n Exception:" + e.ExceptionObject,\r
+                "Unhandled Exception",\r
+                MessageBoxButtons.OK,\r
+                MessageBoxIcon.Error);\r
         }\r
 \r
         public static int InstanceId;\r