Hotfix for migrating invalid settings

newcat · Oct 2, 2016 · ac95e2b · ac95e2b
1 parent 906c37d
commit ac95e2b
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 6 deletions.
diff --git a/tvdc/App.xaml.cs b/tvdc/App.xaml.cs
@@ -1,5 +1,6 @@
 using System;
 using System.Collections.Generic;
+using System.Configuration;
 using System.IO;
 using System.Threading.Tasks;
 using System.Windows;
@@ -30,9 +31,24 @@ private async void Application_Startup(object sender, StartupEventArgs e)
             tvdc.Properties.Settings.Default.Reload();
             if (tvdc.Properties.Settings.Default.upgradeRequired)
             {
-                tvdc.Properties.Settings.Default.Upgrade();
-                tvdc.Properties.Settings.Default.upgradeRequired = false;
-                tvdc.Properties.Settings.Default.Save();
+
+                try
+                {
+                    tvdc.Properties.Settings.Default.GetPreviousVersion("name");
+
+                    tvdc.Properties.Settings.Default.Reset();
+                    tvdc.Properties.Settings.Default.upgradeRequired = false;
+                    tvdc.Properties.Settings.Default.Save();
+
+                } catch (SettingsPropertyNotFoundException)
+                {
+                    //If setting could not be found it means we will also have
+                    //a valid oauth code in previous settings
+                    tvdc.Properties.Settings.Default.Upgrade();
+                    tvdc.Properties.Settings.Default.upgradeRequired = false;
+                    tvdc.Properties.Settings.Default.Save();
+                }
+
             }
 
             if (! await AccountManager.Login())

diff --git a/tvdc/Properties/AssemblyInfo.cs b/tvdc/Properties/AssemblyInfo.cs
@@ -52,6 +52,6 @@
 // You can specify all the values or you can default the Build and Revision Numbers 
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.4.0.0")]
-[assembly: AssemblyFileVersion("1.4.0.0")]
-[assembly: nUpdateVersion("1.4.0.0")]
+[assembly: AssemblyVersion("1.4.1.0")]
+[assembly: AssemblyFileVersion("1.4.1.0")]
+[assembly: nUpdateVersion("1.4.1.0")]