Fixes for some panel items and settings upgrade

thezerothcat · Apr 22, 2018 · 561d2f6 · 561d2f6
1 parent 61fc3ac
commit 561d2f6
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 13 deletions.
diff --git a/LaMulanaItemTrackerForm.cs b/LaMulanaItemTrackerForm.cs
@@ -330,24 +330,15 @@ private void SetStartingImage(String item)
 
                 if ("Vessel/Medicine".Equals(item))
                 {
-                    if (!"shaded".Equals(Properties.Settings.Default.BackgroundMode))
-                    {
-                        vesselPanel.Controls.Remove(vessel);
-                    }
+                    vesselPanel.Controls.Remove(vessel);
                 }
                 if ("Lamp of Time".Equals(item))
                 {
-                    if (!"shaded".Equals(Properties.Settings.Default.BackgroundMode))
-                    {
-                        lampOfTimePanel.Controls.Remove(lampOfTime);
-                    }
+                    lampOfTimePanel.Controls.Remove(lampOfTime);
                 }
                 if ("Woman Statue".Equals(item))
                 {
-                    if (!"shaded".Equals(Properties.Settings.Default.BackgroundMode))
-                    {
-                        womanPanel.Controls.Remove(maternityStatue);
-                    }
+                    womanPanel.Controls.Remove(maternityStatue);
                 }
                 if ("Shield".Equals(item))
                 {
@@ -1706,6 +1697,9 @@ private void LaMulanaItemTrackerForm_Load(object sender, EventArgs e)
                 Properties.Settings.Default.Panel6Contents = Properties.Settings.Default.Panel6Contents.Replace("Hermes Boots", "Hermes' Boots").Replace("Glyph Reader", "reader.exe");
                 Properties.Settings.Default.Save();
 
+                // Fix the backup so we won't lose the upgraded settings on form close.
+                settingsBackup = new SettingsBackup();
+
                 updateAlwaysOnTop();
                 updateFormSize();
                 updateFormColor();
@@ -2989,6 +2983,10 @@ private System.Drawing.Bitmap getBlankImage(string flagName)
             {
                 return global::LMRItemTracker.Properties.Resources.Icon_mantra_blank;
             }
+            else if("w-soft-mantra-combo".Equals(flagName))
+            {
+                return global::LMRItemTracker.Properties.Resources.Icon_mantra_blank;
+            }
             else if ("w-soft-torude".Equals(flagName))
             {
                 return global::LMRItemTracker.Properties.Resources.Icon_torude_blank;

diff --git a/Properties/AssemblyInfo.cs b/Properties/AssemblyInfo.cs
@@ -32,4 +32,4 @@
 // 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.0.13")]
+[assembly: AssemblyVersion("1.0.14")]