Merge pull request #23 from porohkun/v0.2

V0.2
porohkun · Aug 14, 2020 · 29cd5f0 · 29cd5f0
2 parents 3ec0d0a + cc9b02f
commit 29cd5f0
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 4 deletions.
diff --git a/ScreenSlicer/Commands/RestoreDefaultRulesCommand.cs b/ScreenSlicer/Commands/RestoreDefaultRulesCommand.cs
@@ -55,7 +55,7 @@ protected override void ExecuteInternal(bool parameter)
             foreach (var rule in rulesTuple.Where(r => r.IsSelected))
             {
                 var oldRule = Settings.Instance.Compatibility.Rules.FirstOrDefault(r => r.Name == rule.Rule.Name);
-                int index = oldRule == null ? 0 : Settings.Instance.Compatibility.Rules.IndexOf(oldRule);
+                int index = oldRule == null ? Settings.Instance.Compatibility.Rules.Count : Settings.Instance.Compatibility.Rules.IndexOf(oldRule);
                 if (oldRule != null)
                     Settings.Instance.Compatibility.Rules.Remove(oldRule);
                 Settings.Instance.Compatibility.Rules.Insert(index, rule.Rule);

diff --git a/ScreenSlicer/Properties/AssemblyInfo.cs b/ScreenSlicer/Properties/AssemblyInfo.cs
@@ -51,5 +51,5 @@
 // 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("0.2.0.0")]
-[assembly: AssemblyFileVersion("0.2.0.0")]
+[assembly: AssemblyVersion("0.2.1.0")]
+[assembly: AssemblyFileVersion("0.2.1.0")]
diff --git a/ScreenSlicer/Settings/Settings.cs b/ScreenSlicer/Settings/Settings.cs
@@ -1,4 +1,5 @@
 using Newtonsoft.Json;
+using ScreenSlicer.Commands;
 using System;
 using System.ComponentModel;
 using System.IO;
@@ -163,7 +164,11 @@ private static Settings Load()
                     }
                 }
             }
-            result = result ?? new Settings(true);
+            if (result == null)
+            {
+                result = new Settings(true);
+                new RestoreDefaultRulesCommand().Execute(true);
+            }
             result.PropertyChanged += Save;
             return result;
         }

diff --git a/ScreenSlicer/Updating/Updater.cs b/ScreenSlicer/Updating/Updater.cs
@@ -48,6 +48,7 @@ public async void CheckUpdates()
                         {
                             mgr.CreateShortcutForThisExe();
                             mgr.CreateRunAtWindowsStartupRegistry();
+                            _restoreDefaultRules.Execute(true);
                         },
                         onAppUpdate: v =>
                         {