Merge pull request #9 from WaGi-Coding/testing

Restore settings from previous versions from now on
WaGi-Coding · Sep 26, 2019 · 658803e · 658803e
2 parents 34af4ab + 89ed7f2
commit 658803e
Show file tree

Hide file tree

Showing 5 changed files with 34 additions and 6 deletions.
diff --git a/WaGis IP-Blacklister/App.config b/WaGis IP-Blacklister/App.config
@@ -15,7 +15,7 @@
             </setting>
             <setting name="Protocol" serializeAs="String">
                 <value>TCP</value>
-            </setting>         
+            </setting>
             <setting name="Direction" serializeAs="String">
                 <value>BOTH</value>
             </setting>
@@ -40,6 +40,9 @@
             <setting name="Protocol_Number" serializeAs="String">
                 <value>6</value>
             </setting>
+            <setting name="UpgradeRequired" serializeAs="String">
+                <value>True</value>
+            </setting>
         </WaGis_IP_Blacklister.Properties.Settings>
     </userSettings>
 </configuration>
diff --git a/WaGis IP-Blacklister/Form1.cs b/WaGis IP-Blacklister/Form1.cs
@@ -31,8 +31,8 @@ public partial class MainForm : Form
 
         int BlockSize = 1000;
 
-        int protocolNumber = Properties.Settings.Default.Protocol_Number;
-        string protDesc = Properties.Settings.Default.Protocol;
+        int protocolNumber;
+        string protDesc;
 
         //[DllImport("user32.dll", EntryPoint = "ShowCaret")] //
         //public static extern long ShowCaret(IntPtr hwnd);  //  
@@ -45,6 +45,16 @@ public MainForm()
             lblInfo.Text = string.Empty;
 
             notifyIcon1.Icon = new Icon(this.Icon, 40, 40);
+
+            if (Properties.Settings.Default.UpgradeRequired)
+            {
+                Properties.Settings.Default.Upgrade();
+                Properties.Settings.Default.UpgradeRequired = false;
+                Properties.Settings.Default.Save();
+            }
+
+            protocolNumber = Properties.Settings.Default.Protocol_Number;
+            protDesc = Properties.Settings.Default.Protocol;
         }
 
         static bool Win10orWinServer()

diff --git a/WaGis IP-Blacklister/Properties/AssemblyInfo.cs b/WaGis IP-Blacklister/Properties/AssemblyInfo.cs
@@ -20,5 +20,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("1.3.7.5")]
-[assembly: AssemblyFileVersion("1.3.7.5")]
+[assembly: AssemblyVersion("1.3.8")]
+[assembly: AssemblyFileVersion("1.3.8")]
diff --git a/WaGis IP-Blacklister/Properties/Settings.Designer.cs b/WaGis IP-Blacklister/Properties/Settings.Designer.cs
diff --git a/WaGis IP-Blacklister/Properties/Settings.settings b/WaGis IP-Blacklister/Properties/Settings.settings
@@ -30,5 +30,8 @@
     <Setting Name="Protocol_Number" Type="System.Int32" Scope="User">
       <Value Profile="(Default)">6</Value>
     </Setting>
+    <Setting Name="UpgradeRequired" Type="System.Boolean" Scope="User">
+      <Value Profile="(Default)">True</Value>
+    </Setting>
   </Settings>
 </SettingsFile>