3.0.1.3

Fixed The Ability To Launch More Than 1 Instance Of USM.
Fixed TickTimer Form Showing When Doing Alt+Tab.

Author: Pustalorc

Data/USMVer.dat

@@ -1 +1 @@
-3.0.1.2
+3.0.1.3

Data/Versions.zip

@@ -1,6 +1,6 @@
 ----------- Unturned Server Manager -----------
 
-Version: Public 3.0.1.2
+Version: Public 3.0.1.3
 
 [![Github Releases](https://img.shields.io/github/downloads/persiafighter/UnturnedServerManager/latest/total.svg?style=plastic)](https://github.com/persiafighter/UnturnedServerManager/releases/tag/v3.0.0.5) [![GitHub issues](https://img.shields.io/github/issues/persiafighter/UnturnedServerManager.svg?style=plastic)](https://github.com/persiafighter/UnturnedServerManager/issues) [![GitHub closed issues](https://img.shields.io/github/issues-closed/persiafighter/UnturnedServerManager.svg?style=plastic)]()
 
@@ -55,6 +55,11 @@ https://www.reddit.com/r/unturned/comments/546y67/unturned_server_manager/
 
 #Changelog:
 
+**V3.0.1.3** - 
+
+* Fixed The Ability To Launch More Than 1 Instance Of USM.
+* Fixed TickTimer Form Showing When Doing Alt+Tab.
+
 **V3.0.1.2** - 
 
 * Fixed A Problem With Plugin Integrity Update.

README.md

@@ -1,11 +1,10 @@
 using System;
-using System.Collections.Generic;
-using System.Diagnostics;
 using System.IO;
-using System.Linq;
-using System.Net;
+using System.Reflection;
+using System.Runtime.InteropServices;
+using System.Security.AccessControl;
+using System.Security.Principal;
 using System.Threading;
-using System.Threading.Tasks;
 using System.Windows.Forms;
 
 namespace USM
@@ -17,7 +16,7 @@ static void Main()
         {
             Application.EnableVisualStyles();
             Application.SetCompatibleTextRenderingDefault(false);
-            new TickTimer().Show();
+            new TickTimer();
             if (Directory.Exists(Comms.DataPath) == false)
             {
                 Directory.CreateDirectory(Comms.DataPath);
@@ -30,22 +29,47 @@ static void Main()
             Logger.Log("Created log file.");
             StartApp();
         }
+
         private static void StartApp()
         {
-            string appGuid = "2d1dcd0a-9719-44f5-8f0e-2fd79d918fb5";
+            string appGuid = ((GuidAttribute)Assembly.GetExecutingAssembly().GetCustomAttributes(typeof(GuidAttribute), false).GetValue(0)).Value.ToString();
+            string mutexId = string.Format("Global\\{{{0}}}", appGuid);
+            var allowEveryoneRule = new MutexAccessRule(new SecurityIdentifier(WellKnownSidType.WorldSid, null), MutexRights.FullControl, AccessControlType.Allow);
+            var securitySettings = new MutexSecurity();
+            securitySettings.AddAccessRule(allowEveryoneRule);
             try
             {
-                using (Mutex mutex = new Mutex(false, "Global\\" + appGuid))
+                bool createdNew;
+                using (var mutex = new Mutex(false, mutexId, out createdNew, securitySettings))
                 {
-                    if (!mutex.WaitOne(0, false))
+                    var hasHandle = false;
+                    try
+                    {
+                        try
+                        {
+                            hasHandle = mutex.WaitOne(0, false);
+                            if (hasHandle == false)
+                            {
+                                MessageBox.Show("Another instance of unturned server manager is already running!", "Unturned Server Manager", MessageBoxButtons.OK, MessageBoxIcon.Information);
+                                return;
+                            }
+                        }
+                        catch (AbandonedMutexException)
+                        {
+                            hasHandle = true;
+                        }
+                        Logger.Log("Started main application.");
+                        Application.Run(new Manager());
+                        Logger.Log("Main application was closed.");
+                    }
+                    finally
                     {
-                        MessageBox.Show("Another instance of unturned server manager is already running!", "Unturned Server Manager", MessageBoxButtons.OK, MessageBoxIcon.Information);
-                        return;
+                        if (hasHandle)
+                        {
+                            mutex.ReleaseMutex();
+                        }
                     }
                 }
-                Logger.Log("Started main application.");
-                Application.Run(new Manager());
-                Logger.Log("Main application was closed.");
             }
             catch (Exception e)
             {
@@ -59,37 +83,39 @@ private static void StartApp()
         }
     }
 
-    public class TickTimer : Form
+    public class TickTimer
     {
-        public System.ComponentModel.IContainer components;
         public System.Windows.Forms.Timer Timer;
         public static decimal ProgramTime = 0.00M;
         public TickTimer()
         {
-            Opacity = 0;
-            ShowInTaskbar = false;
-            ShowIcon = false;
-            Hide();
-            components = new System.ComponentModel.Container();
             Timer = new System.Windows.Forms.Timer();
             Timer.Interval = 10;
             Timer.Tick += new EventHandler(Timer_tick);
             Timer.Start();
+            Logger.Log("Started timer to keep the program time.");
         }
 
-        private void Timer_tick(object Sender, EventArgs e)
+        public void Dispose()
         {
-            ProgramTime += 0.01M;
+            Dispose(true);
+            GC.SuppressFinalize(this);
         }
 
-        protected override void Dispose(bool disposing)
+        bool disposed = false;
+        protected virtual void Dispose(bool disposing)
         {
-            // Clean up any components being used.
-            if (disposing)
-                if (components != null)
-                    components.Dispose();
+            if (disposed)
+            {
+                return;
+            }
+            Timer.Dispose();
+            disposed = true;
+        }
 
-            base.Dispose(disposing);
+        private void Timer_tick(object Sender, EventArgs e)
+        {
+            ProgramTime += 0.01M;
         }
     }
 }

USM/Boot.cs

@@ -186,10 +186,10 @@ private void CheckLatestVersion()
                 Downloader.Extract("USM.zip", Downloader.Temp);
                 string LatestVersion = File.ReadAllLines(Downloader.Temp + @"\Versions.dat")[2];
                 Logger.Log("Read data from latest USM version.");
-                if (LatestVersion != "3.0.1.2")
+                if (LatestVersion != "3.0.1.3")
                 {
                     Logger.Log("Version of the program is different than the latest one. Opened notification of a new update.");
-                    Notifier.ShowBalloonTip(5000, "New Version", "A new version for Unturned Server Manager is available! Head over to the github page for more information. Your version: 3.0.1.2, Latest Version: " + LatestVersion + ".", ToolTipIcon.None);
+                    Notifier.ShowBalloonTip(5000, "New Version", "A new version for Unturned Server Manager is available! Head over to the github page for more information. Your version: 3.0.1.3, Latest Version: " + LatestVersion + ".", ToolTipIcon.None);
                 }
                 Downloader.ShutOff();
                 Logger.Log("Deleted temp download folder.");

USM/Manager.cs

@@ -10,5 +10,5 @@
 [assembly: AssemblyCulture("")]
 [assembly: ComVisible(false)]
 [assembly: Guid("2d1dcd0a-9719-44f5-8f0e-2fd79d918fb5")]
-[assembly: AssemblyVersion("3.0.1.2")]
-[assembly: AssemblyFileVersion("3.0.1.2")]
+[assembly: AssemblyVersion("3.0.1.3")]
+[assembly: AssemblyFileVersion("3.0.1.3")]