WinGui:

- Attempt to upgrade program settings on upgrade.

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

diff --git a/win/C#/Program.cs b/win/C#/Program.cs
index ea82e3e..8600fe5 100644 (file)
--- a/win/C#/Program.cs
+++ b/win/C#/Program.cs
@@ -8,6 +8,9 @@ namespace Handbrake
     using System;\r
     using System.IO;\r
     using System.Windows.Forms;\r
+\r
+    using Handbrake.Properties;\r
+\r
     using Presets;\r
 \r
     /// <summary>\r
@@ -21,6 +24,12 @@ namespace Handbrake
         [STAThread]\r
         public static void Main()\r
         {\r
+            if (Settings.Default.UpdateRequired)\r
+            {\r
+                Settings.Default.Upgrade();\r
+                Settings.Default.UpdateRequired = false;\r
+            }\r
+\r
             AppDomain.CurrentDomain.UnhandledException += new UnhandledExceptionEventHandler(CurrentDomain_UnhandledException);\r
 \r
             const string failedInstall = "HandBrake is not installed properly. Please reinstall HandBrake. \n\n";\r

diff --git a/win/C#/Properties/Settings.Designer.cs b/win/C#/Properties/Settings.Designer.cs
index 018b95e..ef0389f 100644 (file)
--- a/win/C#/Properties/Settings.Designer.cs
+++ b/win/C#/Properties/Settings.Designer.cs
@@ -536,5 +536,17 @@ namespace Handbrake.Properties {
                 this["hb_min_cli"] = value;\r
             }\r
         }\r
+        \r
+        [global::System.Configuration.UserScopedSettingAttribute()]\r
+        [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]\r
+        [global::System.Configuration.DefaultSettingValueAttribute("True")]\r
+        public bool UpdateRequired {\r
+            get {\r
+                return ((bool)(this["UpdateRequired"]));\r
+            }\r
+            set {\r
+                this["UpdateRequired"] = value;\r
+            }\r
+        }\r
     }\r
 }\r

diff --git a/win/C#/Properties/Settings.settings b/win/C#/Properties/Settings.settings
index cc7649f..fe32569 100644 (file)
--- a/win/C#/Properties/Settings.settings
+++ b/win/C#/Properties/Settings.settings
@@ -131,5 +131,8 @@
     <Setting Name="hb_min_cli" Type="System.Int32" Scope="User">\r
       <Value Profile="(Default)">3264</Value>\r
     </Setting>\r
+    <Setting Name="UpdateRequired" Type="System.Boolean" Scope="User">\r
+      <Value Profile="(Default)">True</Value>\r
+    </Setting>\r
   </Settings>\r
 </SettingsFile>
\ No newline at end of file

diff --git a/win/C#/app.config b/win/C#/app.config
index 6a9c862..525247e 100644 (file)
--- a/win/C#/app.config
+++ b/win/C#/app.config
@@ -137,6 +137,9 @@
       <setting name="hb_min_cli" serializeAs="String">\r
         <value>3264</value>\r
       </setting>\r
+      <setting name="UpdateRequired" serializeAs="String">\r
+        <value>True</value>\r
+      </setting>\r
     </Handbrake.Properties.Settings>\r
   </userSettings>\r
   <startup />\r