WinGui:

- Added support for naming tracks. New text entry field on the Advanced Audio Window. (Note: May be some CLI issues that need to be fixed up for this. We'll see)
- Disabled application settings upgrade when moving from a release to a svn build. Upgrades now only work for svn -> svn builds as there has been reliability issues when upgrading from much older builds.

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

1 files changed, 15 insertions, 4 deletions

diff --git a/win/CS/Program.cs b/win/CS/Program.cs
index a04c45e12..4e7dfcbc0 100644
--- a/win/CS/Program.cs
+++ b/win/CS/Program.cs
@@ -10,6 +10,7 @@ namespace Handbrake
     using System.IO;

     using System.Windows.Forms;

 

+    using HandBrake.ApplicationServices;

     using HandBrake.ApplicationServices.Exceptions;

     using HandBrake.ApplicationServices.Services;

 

@@ -60,10 +61,20 @@ namespace Handbrake
             {

                 if (Settings.Default.UpdateRequired)

                 {

-                    Settings.Default.Upgrade();

-                    Settings.Default.UpdateRequired = false;

-                    Settings.Default.Save();

-                

+                    // Upgrading user settings seems to be problematic from 0.9.5 -> Current, 

+                    // Seems to be seeing user.config corrupation from time to time.

+                    // So I'm going to only allow this for users using svn builds.

+                    // Going from major to major will require the user to reset.

+                    // Going from svn to svn will attempt the upgrade.

+                    UserSettingService service = new UserSettingService();

+                    string version = service.GetUserSettingString(UserSettingConstants.HandBrakeVersion);

+                    if (version.Contains("svn"))

+                    {

+                        Settings.Default.Upgrade();

+                        Settings.Default.UpdateRequired = false;

+                        Settings.Default.Save();

+                    }

+

                     // Re-detect the CLI version data.

                     Functions.Main.SetCliVersionData();

                 }