Hotfix to 2.5

hellzerg · Nov 21, 2019 · 2476d10 · 2476d10
1 parent e0a1b4c
commit 2476d10
Show file tree

Hide file tree

Showing 6 changed files with 35 additions and 35 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,6 +2,9 @@
 
 All notable changes to this project will be documented in this file.
 
+## [2.5] - 2019-11-21
+- Bugfix when restoring state
+
 ## [2.4] - 2019-11-15
 - New: Choose font size
 - New: Hide passwords from list

diff --git a/Lain/MainForm.cs b/Lain/MainForm.cs
@@ -52,11 +52,7 @@ public MainForm(SecureString key)
 
         private void RestoreWindowState()
         {
-            if (Options.CurrentOptions.WindowSize.IsEmpty && Options.CurrentOptions.WindowLocation == null)
-            {
-                return;
-            }
-
+            this.WindowState = Options.CurrentOptions.WindowState;
             this.Size = Options.CurrentOptions.WindowSize;
 
             if (Options.CurrentOptions.WindowLocation != null)
@@ -71,8 +67,18 @@ private void RestoreWindowState()
 
         private void SaveWindowState()
         {
-            Options.CurrentOptions.WindowLocation = this.Location;
-            Options.CurrentOptions.WindowSize = this.Size;
+            Options.CurrentOptions.WindowState = this.WindowState;
+
+            if (this.WindowState == FormWindowState.Normal)
+            {
+                Options.CurrentOptions.WindowLocation = this.Location;
+                Options.CurrentOptions.WindowSize = this.Size;
+            }
+            else
+            {
+                Options.CurrentOptions.WindowLocation = this.RestoreBounds.Location;
+                Options.CurrentOptions.WindowSize = this.RestoreBounds.Size;
+            }
         }
 
         private string NewVersionMessage(string latest)

diff --git a/Lain/Options.cs b/Lain/Options.cs
@@ -17,6 +17,7 @@ public class SettingsJson
         public int FontSize { get; set; }
         public Size WindowSize { get; set; }
         public Point? WindowLocation { get; set; }
+        public FormWindowState WindowState { get; set; }
     }
 
     internal static class Options
@@ -30,9 +31,6 @@ internal static class Options
 
         internal static SettingsJson CurrentOptions = new SettingsJson();
 
-        // use this to determine if changes have been made
-        static SettingsJson _flag = new SettingsJson();
-
         internal static void ApplyTheme(Form f)
         {
             switch (CurrentOptions.Color)
@@ -97,19 +95,16 @@ internal static void SaveSettings()
         {
             if (File.Exists(_settingsFile))
             {
-                if ((_flag.HidePasswords != CurrentOptions.HidePasswords) || (_flag.WindowLocation != CurrentOptions.WindowLocation) || (_flag.WindowSize != CurrentOptions.WindowSize) || (_flag.FontSize != CurrentOptions.FontSize) || (_flag.Color != CurrentOptions.Color) || (_flag.Authorize != CurrentOptions.Authorize) || (_flag.AutoLock != CurrentOptions.AutoLock) || (_flag.AutoStart != CurrentOptions.AutoStart) || (_flag.Minutes != CurrentOptions.Minutes))
-                {
-                    File.Delete(_settingsFile);
+                File.WriteAllText(_settingsFile, string.Empty);
 
-                    using (FileStream fs = File.Open(_settingsFile, FileMode.OpenOrCreate))
-                    using (StreamWriter sw = new StreamWriter(fs))
-                    using (JsonWriter jw = new JsonTextWriter(sw))
-                    {
-                        jw.Formatting = Formatting.Indented;
+                using (FileStream fs = File.Open(_settingsFile, FileMode.OpenOrCreate))
+                using (StreamWriter sw = new StreamWriter(fs))
+                using (JsonWriter jw = new JsonTextWriter(sw))
+                {
+                    jw.Formatting = Formatting.Indented;
 
-                        JsonSerializer serializer = new JsonSerializer();
-                        serializer.Serialize(jw, CurrentOptions);
-                    }
+                    JsonSerializer serializer = new JsonSerializer();
+                    serializer.Serialize(jw, CurrentOptions);
                 }
             }
         }
@@ -127,6 +122,7 @@ internal static void LoadSettings()
                 CurrentOptions.WindowLocation = null;
                 CurrentOptions.WindowSize = new Size(907, 681);
                 CurrentOptions.FontSize = 1;
+                CurrentOptions.WindowState = FormWindowState.Normal;
 
                 using (FileStream fs = File.Open(_settingsFile, FileMode.CreateNew))
                 using (StreamWriter sw = new StreamWriter(fs))
@@ -142,16 +138,11 @@ internal static void LoadSettings()
             {
                 CurrentOptions = JsonConvert.DeserializeObject<SettingsJson>(File.ReadAllText(_settingsFile));
 
-                // initialize flag
-                _flag.Color = CurrentOptions.Color;
-                _flag.Authorize = CurrentOptions.Authorize;
-                _flag.AutoLock = CurrentOptions.AutoLock;
-                _flag.AutoStart = CurrentOptions.AutoStart;
-                _flag.Minutes = CurrentOptions.Minutes;
-                _flag.WindowLocation = CurrentOptions.WindowLocation;
-                _flag.WindowSize = CurrentOptions.WindowSize;
-                _flag.FontSize = CurrentOptions.FontSize;
-                _flag.HidePasswords = CurrentOptions.HidePasswords;
+                if (CurrentOptions.WindowSize.IsEmpty)
+                {
+                    CurrentOptions.WindowSize = new Size(907, 681);
+                    SaveSettings();
+                }
             }
         }
     }

diff --git a/Lain/Program.cs b/Lain/Program.cs
@@ -13,7 +13,7 @@ static class Program
 
         // Enter current version here
         internal readonly static float Major = 2;
-        internal readonly static float Minor = 4;
+        internal readonly static float Minor = 5;
 
         /* END OF VERSION PROPERTIES */
 

diff --git a/README.md b/README.md
@@ -24,5 +24,5 @@ https://github.com/hellzerg/lain/blob/master/IMAGES.md
 
 ## Details: ##
 
-* Latest version: 2.4
-* Released: November 15, 2019
+* Latest version: 2.5
+* Released: November 21, 2019
diff --git a/version.txt b/version.txt
@@ -1 +1 @@
-2.4
+2.5