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 @@ 2000-01-01 + + True + 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 @@ 2000-01-01 + + True + \ 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 @@ Reset This will reset ALL the user global settings for the server manager. The server manager will be closed if successful. Enable Run as Administrator Prompt on Startup + Check if Server Manager Running on Startup Main Window Start Mode: Minimize To Tray Manage firewall settings automatically 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 @@ +