From ec6eb847dacac155b7180c9c21cf70a30a61fcf2 Mon Sep 17 00:00:00 2001
From: Brett Hewitson <bletch1971@hotmail.com>
Date: Thu, 23 Dec 2021 16:33:03 +1000
Subject: [PATCH] added option to disable the running instance check.

---
 src/ARKServerManager/App.config               |  3 +++
 src/ARKServerManager/App.xaml.cs              |  2 +-
 src/ARKServerManager/Config.Designer.cs       | 12 ++++++++++
 src/ARKServerManager/Config.settings          |  3 +++
 .../Globalization/en-US/en-US.xaml            |  1 +
 .../UserControls/GlobalSettingsControl.xaml   |  1 +
 src/ARKServerManager/VersionFeed.xml          |  9 ++++++--
 src/ARKServerManager/VersionFeedBeta.xml      | 23 +++++++++++++++++++
 src/ConanServerManager/App.config             |  3 +++
 src/ConanServerManager/App.xaml.cs            |  2 +-
 src/ConanServerManager/Config.Designer.cs     | 12 ++++++++++
 src/ConanServerManager/Config.settings        |  3 +++
 .../Globalization/en-US/en-US.xaml            |  1 +
 .../UserControls/GlobalSettingsControl.xaml   |  1 +
 src/ConanServerManager/VersionFeed.xml        |  9 ++++++--
 src/ConanServerManager/VersionFeedBeta.xml    | 23 +++++++++++++++++++
 16 files changed, 102 insertions(+), 6 deletions(-)

diff --git a/src/ARKServerManager/App.config b/src/ARKServerManager/App.config
index f5c3098e..4650a137 100644
--- a/src/ARKServerManager/App.config
+++ b/src/ARKServerManager/App.config
@@ -870,6 +870,9 @@
       <setting name="ServerCallUrlLast" serializeAs="String">
         <value>2000-01-01</value>
       </setting>
+      <setting name="CheckIfServerManagerRunningOnStartup" serializeAs="String">
+        <value>True</value>
+      </setting>
     </ServerManagerTool.Config>
   </userSettings>
 </configuration>
diff --git a/src/ARKServerManager/App.xaml.cs b/src/ARKServerManager/App.xaml.cs
index 0b72a1f0..a74cb8c1 100644
--- a/src/ARKServerManager/App.xaml.cs
+++ b/src/ARKServerManager/App.xaml.cs
@@ -458,7 +458,7 @@ namespace ServerManagerTool
             }
 
             // check if application is already running
-            if (ProcessUtils.IsAlreadyRunning())
+            if (Config.Default.CheckIfServerManagerRunningOnStartup && ProcessUtils.IsAlreadyRunning())
             {
                 var result = MessageBox.Show(_globalizer.GetResourceString("Application_SingleInstanceLabel"), _globalizer.GetResourceString("Application_SingleInstanceTitle"), MessageBoxButton.YesNo, MessageBoxImage.Question);
                 if (result == MessageBoxResult.Yes)
diff --git a/src/ARKServerManager/Config.Designer.cs b/src/ARKServerManager/Config.Designer.cs
index 0da6fab5..9cb08be9 100644
--- a/src/ARKServerManager/Config.Designer.cs
+++ b/src/ARKServerManager/Config.Designer.cs
@@ -3078,5 +3078,17 @@ namespace ServerManagerTool {
                 this["ServerCallUrlLast"] = value;
             }
         }
+        
+        [global::System.Configuration.UserScopedSettingAttribute()]
+        [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+        [global::System.Configuration.DefaultSettingValueAttribute("True")]
+        public bool CheckIfServerManagerRunningOnStartup {
+            get {
+                return ((bool)(this["CheckIfServerManagerRunningOnStartup"]));
+            }
+            set {
+                this["CheckIfServerManagerRunningOnStartup"] = value;
+            }
+        }
     }
 }
diff --git a/src/ARKServerManager/Config.settings b/src/ARKServerManager/Config.settings
index 5ee0c640..271f57e8 100644
--- a/src/ARKServerManager/Config.settings
+++ b/src/ARKServerManager/Config.settings
@@ -848,5 +848,8 @@
     <Setting Name="ServerCallUrlLast" Type="System.DateTime" Scope="User">
       <Value Profile="(Default)">2000-01-01</Value>
     </Setting>
+    <Setting Name="CheckIfServerManagerRunningOnStartup" Type="System.Boolean" Scope="User">
+      <Value Profile="(Default)">True</Value>
+    </Setting>
   </Settings>
 </SettingsFile>
\ No newline at end of file
diff --git a/src/ARKServerManager/Globalization/en-US/en-US.xaml b/src/ARKServerManager/Globalization/en-US/en-US.xaml
index 71c51300..5005fdb1 100644
--- a/src/ARKServerManager/Globalization/en-US/en-US.xaml
+++ b/src/ARKServerManager/Globalization/en-US/en-US.xaml
@@ -489,6 +489,7 @@
     <sys:String x:Key="GlobalSettings_ResetButtonLabel">Reset</sys:String>
     <sys:String x:Key="GlobalSettings_ResetButtonTooltip">This will reset ALL the user global settings for the server manager. The server manager will be closed if successful.</sys:String>
     <sys:String x:Key="GlobalSettings_RunAsAdministratorLabel">Enable Run as Administrator Prompt on Startup</sys:String>
+    <sys:String x:Key="GlobalSettings_CheckIfServerManagerRunningOnStartupLabel">Check if Server Manager Running on Startup</sys:String>
     <sys:String x:Key="GlobalSettings_StartModeLabel">Main Window Start Mode:</sys:String>
     <sys:String x:Key="GlobalSettings_MinimizeToTrayLabel">Minimize To Tray</sys:String>
     <sys:String x:Key="GlobalSettings_ManageFirewallLabel">Manage firewall settings automatically</sys:String>
diff --git a/src/ARKServerManager/UserControls/GlobalSettingsControl.xaml b/src/ARKServerManager/UserControls/GlobalSettingsControl.xaml
index c1d6c846..6dc62179 100644
--- a/src/ARKServerManager/UserControls/GlobalSettingsControl.xaml
+++ b/src/ARKServerManager/UserControls/GlobalSettingsControl.xaml
@@ -61,6 +61,7 @@
                 </DockPanel>
 
                 <CheckBox Grid.Row="1" Grid.Column="0" Grid.ColumnSpan="2" Margin="5" Content="{DynamicResource GlobalSettings_RunAsAdministratorLabel}" IsChecked="{Binding Config.RunAsAdministratorPrompt, Mode=TwoWay}" HorizontalAlignment="Left"/>
+                <CheckBox Grid.Row="1" Grid.Column="2" Grid.ColumnSpan="2" Margin="5" Content="{DynamicResource GlobalSettings_CheckIfServerManagerRunningOnStartupLabel}" IsChecked="{Binding Config.CheckIfServerManagerRunningOnStartup, Mode=TwoWay}" HorizontalAlignment="Left"/>
 
                 <Label    Grid.Row="2" Grid.Column="0" Margin="1" Content="{DynamicResource GlobalSettings_StartModeLabel}" VerticalAlignment="Center"/>
                 <ComboBox Name="WindowStateComboBox" Grid.Row="2" Grid.Column="1" Margin="5" ItemsSource="{Binding ElementName=GlobalSettings, Path=WindowStates}" SelectedValue="{Binding Config.MainWindow_WindowState}" SelectedValuePath="ValueMember" DisplayMemberPath="DisplayMember" PreviewMouseWheel="ComboBox_PreviewMouseWheel"/>
diff --git a/src/ARKServerManager/VersionFeed.xml b/src/ARKServerManager/VersionFeed.xml
index 8b326052..2f02fdcd 100644
--- a/src/ARKServerManager/VersionFeed.xml
+++ b/src/ARKServerManager/VersionFeed.xml
@@ -9,8 +9,8 @@
 
   <entry>
     <id>urn:uuid:A58CA1BE-3474-480D-9DCF-3B217C47F4B0</id>
-    <title>1.1.415 (1.1.415.1)</title>
-    <summary>1.1.415.1</summary>
+    <title>1.1.415 (1.1.415.2)</title>
+    <summary>1.1.415.2</summary>
     <link href="" />
     <updated>2021-12-23T00:00:00Z</updated>
     <content type="xhtml">
@@ -21,6 +21,11 @@
           <ul>
             <li>Fixed an error when deleting from a list while iterating over it.</li>
           </ul>
+          <u style="font-size: .9em;">NEW</u>
+          <br/>
+          <ul>
+            <li>Added option to enable/disable the check for running server manager instance on startup.</li>
+          </ul>
         </p>
       </div>
     </content>
diff --git a/src/ARKServerManager/VersionFeedBeta.xml b/src/ARKServerManager/VersionFeedBeta.xml
index f59fe2e6..12d8ffa6 100644
--- a/src/ARKServerManager/VersionFeedBeta.xml
+++ b/src/ARKServerManager/VersionFeedBeta.xml
@@ -7,6 +7,29 @@
   <link href="http://arkservermanager.freeforums.net/" />
   <updated>2021-12-23T00:00:00Z</updated>
 
+  <entry>
+    <id>urn:uuid:0A99681B-B2F1-4149-A9C4-1B06FCC8494D</id>
+    <title>1.1.415 (1.1.415.2)</title>
+    <summary>1.1.415.2</summary>
+    <link href="" />
+    <updated>2021-12-23T00:00:00Z</updated>
+    <content type="xhtml">
+      <div xmlns="http://www.w3.org/1999/xhtml" style="font-family: Arial, Verdana, Helvetica, Sans-Serif;font-size: .8em;">
+        <p>
+          <u style="font-size: .9em;">NEW</u>
+          <br/>
+          <ul>
+            <li>Added option to enable/disable the check for running server manager instance on startup.</li>
+          </ul>
+        </p>
+      </div>
+    </content>
+    <author>
+      <name>bletch</name>
+      <email>bletch1971@hotmail.com</email>
+    </author>
+  </entry>
+
   <entry>
     <id>urn:uuid:A58CA1BE-3474-480D-9DCF-3B217C47F4B0</id>
     <title>1.1.415 (1.1.415.1)</title>
diff --git a/src/ConanServerManager/App.config b/src/ConanServerManager/App.config
index 9f915195..c2b96f10 100644
--- a/src/ConanServerManager/App.config
+++ b/src/ConanServerManager/App.config
@@ -645,6 +645,9 @@
       <setting name="ServerCallUrlLast" serializeAs="String">
         <value>2000-01-01</value>
       </setting>
+      <setting name="CheckIfServerManagerRunningOnStartup" serializeAs="String">
+        <value>True</value>
+      </setting>
     </ServerManagerTool.Config>
   </userSettings>
 </configuration>
\ No newline at end of file
diff --git a/src/ConanServerManager/App.xaml.cs b/src/ConanServerManager/App.xaml.cs
index c4601da4..09c4b028 100644
--- a/src/ConanServerManager/App.xaml.cs
+++ b/src/ConanServerManager/App.xaml.cs
@@ -450,7 +450,7 @@ namespace ServerManagerTool
             }
 
             // check if application is already running
-            if (ProcessUtils.IsAlreadyRunning())
+            if (Config.Default.CheckIfServerManagerRunningOnStartup && ProcessUtils.IsAlreadyRunning())
             {
                 var result = MessageBox.Show(_globalizer.GetResourceString("Application_SingleInstanceLabel"), _globalizer.GetResourceString("Application_SingleInstanceTitle"), MessageBoxButton.YesNo, MessageBoxImage.Question);
                 if (result == MessageBoxResult.Yes)
diff --git a/src/ConanServerManager/Config.Designer.cs b/src/ConanServerManager/Config.Designer.cs
index 2910a4ef..cdd999e4 100644
--- a/src/ConanServerManager/Config.Designer.cs
+++ b/src/ConanServerManager/Config.Designer.cs
@@ -2261,5 +2261,17 @@ namespace ServerManagerTool {
                 this["ServerCallUrlLast"] = value;
             }
         }
+        
+        [global::System.Configuration.UserScopedSettingAttribute()]
+        [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+        [global::System.Configuration.DefaultSettingValueAttribute("True")]
+        public bool CheckIfServerManagerRunningOnStartup {
+            get {
+                return ((bool)(this["CheckIfServerManagerRunningOnStartup"]));
+            }
+            set {
+                this["CheckIfServerManagerRunningOnStartup"] = value;
+            }
+        }
     }
 }
diff --git a/src/ConanServerManager/Config.settings b/src/ConanServerManager/Config.settings
index 51d5263c..a45de1ad 100644
--- a/src/ConanServerManager/Config.settings
+++ b/src/ConanServerManager/Config.settings
@@ -623,5 +623,8 @@
     <Setting Name="ServerCallUrlLast" Type="System.DateTime" Scope="User">
       <Value Profile="(Default)">2000-01-01</Value>
     </Setting>
+    <Setting Name="CheckIfServerManagerRunningOnStartup" Type="System.Boolean" Scope="User">
+      <Value Profile="(Default)">True</Value>
+    </Setting>
   </Settings>
 </SettingsFile>
\ No newline at end of file
diff --git a/src/ConanServerManager/Globalization/en-US/en-US.xaml b/src/ConanServerManager/Globalization/en-US/en-US.xaml
index bc78981e..a449a3c6 100644
--- a/src/ConanServerManager/Globalization/en-US/en-US.xaml
+++ b/src/ConanServerManager/Globalization/en-US/en-US.xaml
@@ -669,6 +669,7 @@
     <sys:String x:Key="GlobalSettings_ResetButtonLabel">Reset</sys:String>
     <sys:String x:Key="GlobalSettings_ResetButtonTooltip">This will reset ALL the user global settings for the server manager. The server manager will be closed if successful.</sys:String>
     <sys:String x:Key="GlobalSettings_RunAsAdministratorLabel">Enable Run as Administrator Prompt on Startup</sys:String>
+    <sys:String x:Key="GlobalSettings_CheckIfServerManagerRunningOnStartupLabel">Check if Server Manager Running on Startup</sys:String>
     <sys:String x:Key="GlobalSettings_StartModeLabel">Main Window Start Mode:</sys:String>
     <sys:String x:Key="GlobalSettings_MinimizeToTrayLabel">Minimize To Tray</sys:String>
     <sys:String x:Key="GlobalSettings_ManageFirewallLabel">Manage firewall settings automatically</sys:String>
diff --git a/src/ConanServerManager/UserControls/GlobalSettingsControl.xaml b/src/ConanServerManager/UserControls/GlobalSettingsControl.xaml
index 108beb07..dac1bf4f 100644
--- a/src/ConanServerManager/UserControls/GlobalSettingsControl.xaml
+++ b/src/ConanServerManager/UserControls/GlobalSettingsControl.xaml
@@ -65,6 +65,7 @@
                 </DockPanel>
 
                 <CheckBox Grid.Row="1" Grid.Column="0" Grid.ColumnSpan="2" Margin="5" Content="{DynamicResource GlobalSettings_RunAsAdministratorLabel}" IsChecked="{Binding Config.RunAsAdministratorPrompt, Mode=TwoWay}" HorizontalAlignment="Left"/>
+                <CheckBox Grid.Row="1" Grid.Column="2" Grid.ColumnSpan="2" Margin="5" Content="{DynamicResource GlobalSettings_CheckIfServerManagerRunningOnStartupLabel}" IsChecked="{Binding Config.CheckIfServerManagerRunningOnStartup, Mode=TwoWay}" HorizontalAlignment="Left"/>
 
                 <Label    Grid.Row="2" Grid.Column="0" Margin="1" Content="{DynamicResource GlobalSettings_StartModeLabel}" VerticalAlignment="Center"/>
                 <ComboBox Name="WindowStateComboBox" Grid.Row="2" Grid.Column="1" Margin="5" ItemsSource="{Binding ElementName=GlobalSettings, Path=WindowStates}" SelectedValue="{Binding Config.MainWindow_WindowState}" SelectedValuePath="ValueMember" DisplayMemberPath="DisplayMember" PreviewMouseWheel="ComboBox_PreviewMouseWheel"/>
diff --git a/src/ConanServerManager/VersionFeed.xml b/src/ConanServerManager/VersionFeed.xml
index b9adb76f..062aff3e 100644
--- a/src/ConanServerManager/VersionFeed.xml
+++ b/src/ConanServerManager/VersionFeed.xml
@@ -9,8 +9,8 @@
 
   <entry>
     <id>urn:uuid:656D558C-0D7C-47CF-BB80-527443B0EA5E</id>
-    <title>1.1.60 (1.1.60.1)</title>
-    <summary>1.1.60.1</summary>
+    <title>1.1.60 (1.1.60.2)</title>
+    <summary>1.1.60.2</summary>
     <link href="" />
     <updated>2021-12-23T00:00:00Z</updated>
     <content type="xhtml">
@@ -21,6 +21,11 @@
           <ul>
             <li>Fixed an error when deleting from a list while iterating over it.</li>
           </ul>
+          <u style="font-size: .9em;">NEW</u>
+          <br/>
+          <ul>
+            <li>Added option to enable/disable the check for running server manager instance on startup.</li>
+          </ul>
         </p>
       </div>
     </content>
diff --git a/src/ConanServerManager/VersionFeedBeta.xml b/src/ConanServerManager/VersionFeedBeta.xml
index b40e8460..21e59d27 100644
--- a/src/ConanServerManager/VersionFeedBeta.xml
+++ b/src/ConanServerManager/VersionFeedBeta.xml
@@ -7,6 +7,29 @@
   <link href="http://servermanagers.freeforums.net/" />
   <updated>2021-12-23T00:00:00Z</updated>
 
+  <entry>
+    <id>urn:uuid:832E12C1-F632-4B02-A5DF-21BF85D056ED</id>
+    <title>1.1.60 (1.1.60.2)</title>
+    <summary>1.1.60.2</summary>
+    <link href="" />
+    <updated>2021-12-23T00:00:00Z</updated>
+    <content type="xhtml">
+      <div xmlns="http://www.w3.org/1999/xhtml" style="font-family: Arial, Verdana, Helvetica, Sans-Serif;font-size: .8em;">
+        <p>
+          <u style="font-size: .9em;">NEW</u>
+          <br/>
+          <ul>
+            <li>Added option to enable/disable the check for running server manager instance on startup.</li>
+          </ul>
+        </p>
+      </div>
+    </content>
+    <author>
+      <name>bletch</name>
+      <email>bletch1971@hotmail.com</email>
+    </author>
+  </entry>
+
   <entry>
     <id>urn:uuid:656D558C-0D7C-47CF-BB80-527443B0EA5E</id>
     <title>1.1.60 (1.1.60.1)</title>