From c7184be5ef68495d76972d9692cdbf73f7739ae4 Mon Sep 17 00:00:00 2001
From: Nathan Woodburn <github@nathan.woodburn.au>
Date: Mon, 12 Jun 2023 21:55:43 +1000
Subject: [PATCH] main: Fixed installer problem (need to increase file version
 number)

---
 FireWallet/FireWallet.csproj               | 13 +++++++++++
 FireWallet/MainForm.cs                     |  5 ++++-
 FireWallet/Properties/Settings.Designer.cs | 26 ++++++++++++++++++++++
 FireWallet/Properties/Settings.settings    |  6 +++++
 FireWalletSetup/FireWalletSetup.vdproj     |  6 ++---
 5 files changed, 52 insertions(+), 4 deletions(-)
 create mode 100644 FireWallet/Properties/Settings.Designer.cs
 create mode 100644 FireWallet/Properties/Settings.settings

diff --git a/FireWallet/FireWallet.csproj b/FireWallet/FireWallet.csproj
index 103a242..f5cb4dd 100644
--- a/FireWallet/FireWallet.csproj
+++ b/FireWallet/FireWallet.csproj
@@ -12,6 +12,7 @@
     <PackageIcon>HSDBatcher.png</PackageIcon>
     <RepositoryUrl>https://github.com/Nathanwoodburn/FireWallet</RepositoryUrl>
     <RepositoryType>git</RepositoryType>
+    <Version>2.4</Version>
   </PropertyGroup>
 
   <ItemGroup>
@@ -36,6 +37,11 @@
       <AutoGen>True</AutoGen>
       <DependentUpon>Resources.resx</DependentUpon>
     </Compile>
+    <Compile Update="Properties\Settings.Designer.cs">
+      <DesignTimeSharedInput>True</DesignTimeSharedInput>
+      <AutoGen>True</AutoGen>
+      <DependentUpon>Settings.settings</DependentUpon>
+    </Compile>
   </ItemGroup>
 
   <ItemGroup>
@@ -45,4 +51,11 @@
     </EmbeddedResource>
   </ItemGroup>
 
+  <ItemGroup>
+    <None Update="Properties\Settings.settings">
+      <Generator>SettingsSingleFileGenerator</Generator>
+      <LastGenOutput>Settings.Designer.cs</LastGenOutput>
+    </None>
+  </ItemGroup>
+
 </Project>
\ No newline at end of file
diff --git a/FireWallet/MainForm.cs b/FireWallet/MainForm.cs
index 3cad6e7..e5c417c 100644
--- a/FireWallet/MainForm.cs
+++ b/FireWallet/MainForm.cs
@@ -660,7 +660,10 @@ namespace FireWallet
 
             if (await APIGet("", false) == "Error")
             {
-                toolStripStatusLabelstatus.Text = "Status: Node Not Connected";
+                if (toolStripStatusLabelstatus.Text != "Status: HSD Starting")
+                {
+                    toolStripStatusLabelstatus.Text = "Status: Node Not Connected";
+                }
                 return;
             }
             else
diff --git a/FireWallet/Properties/Settings.Designer.cs b/FireWallet/Properties/Settings.Designer.cs
new file mode 100644
index 0000000..227ac8d
--- /dev/null
+++ b/FireWallet/Properties/Settings.Designer.cs
@@ -0,0 +1,26 @@
+//------------------------------------------------------------------------------
+// <auto-generated>
+//     This code was generated by a tool.
+//     Runtime Version:4.0.30319.42000
+//
+//     Changes to this file may cause incorrect behavior and will be lost if
+//     the code is regenerated.
+// </auto-generated>
+//------------------------------------------------------------------------------
+
+namespace FireWallet.Properties {
+    
+    
+    [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
+    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "17.6.0.0")]
+    internal sealed partial class Settings : global::System.Configuration.ApplicationSettingsBase {
+        
+        private static Settings defaultInstance = ((Settings)(global::System.Configuration.ApplicationSettingsBase.Synchronized(new Settings())));
+        
+        public static Settings Default {
+            get {
+                return defaultInstance;
+            }
+        }
+    }
+}
diff --git a/FireWallet/Properties/Settings.settings b/FireWallet/Properties/Settings.settings
new file mode 100644
index 0000000..049245f
--- /dev/null
+++ b/FireWallet/Properties/Settings.settings
@@ -0,0 +1,6 @@
+<?xml version='1.0' encoding='utf-8'?>
+<SettingsFile xmlns="http://schemas.microsoft.com/VisualStudio/2004/01/settings" CurrentProfile="(Default)">
+  <Profiles>
+    <Profile Name="(Default)" />
+  </Profiles>
+</SettingsFile>
diff --git a/FireWalletSetup/FireWalletSetup.vdproj b/FireWalletSetup/FireWalletSetup.vdproj
index e2bd61e..01f1fb1 100644
--- a/FireWalletSetup/FireWalletSetup.vdproj
+++ b/FireWalletSetup/FireWalletSetup.vdproj
@@ -224,15 +224,15 @@
         {
         "Name" = "8:Microsoft Visual Studio"
         "ProductName" = "8:FireWallet"
-        "ProductCode" = "8:{EEABCF5F-54F1-4C71-A82F-FA131D9CC8C1}"
-        "PackageCode" = "8:{7B12D25F-C460-4627-B920-932CD9ACCF9E}"
+        "ProductCode" = "8:{24264791-86B1-49B5-88C9-5042C3FA1BF2}"
+        "PackageCode" = "8:{8CC25786-EE60-4F7F-970E-D122B84DF8B5}"
         "UpgradeCode" = "8:{0C86F725-6B01-4173-AA05-3F0EDF481362}"
         "AspNetVersion" = "8:"
         "RestartWWWService" = "11:FALSE"
         "RemovePreviousVersions" = "11:TRUE"
         "DetectNewerInstalledVersion" = "11:TRUE"
         "InstallAllUsers" = "11:FALSE"
-        "ProductVersion" = "8:2.2"
+        "ProductVersion" = "8:2.4"
         "Manufacturer" = "8:Nathan.Woodburn/"
         "ARPHELPTELEPHONE" = "8:"
         "ARPHELPLINK" = "8:https://l.woodburn.au/discord"