Proper v1.5

hellzerg · Nov 20, 2021 · 308520e · 308520e
1 parent f62dc29
commit 308520e
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 6 deletions.
diff --git a/Mint/MainForm.cs b/Mint/MainForm.cs
@@ -323,9 +323,6 @@ private void CheckForUpdate()
                             // DOWNLOAD NEW VERSION
                             client.DownloadFile(NewDownloadLink(latestVersion), tempFile);
 
-                            // ALLOW MINT TO EXIT
-                            _allowExit = true;
-
                             // DELETE PREVIOUS BACK-UP
                             if (System.IO.File.Exists(archiveFile))
                             {
@@ -338,6 +335,15 @@ private void CheckForUpdate()
                             // PATCH
                             System.IO.File.Move(tempFile, appFile);
 
+                            // BYPASS SINGLE-INSTANCE MECHANISM
+                            _allowExit = true;
+                            if (Program.MUTEX != null)
+                            {
+                                Program.MUTEX.ReleaseMutex();
+                                Program.MUTEX.Dispose();
+                                Program.MUTEX = null;
+                            }
+
                             Application.Restart();
                         }
                         catch (Exception ex)

diff --git a/Mint/Program.cs b/Mint/Program.cs
@@ -28,6 +28,7 @@ internal static float GetCurrentVersion()
         const string _jsonAssembly = @"Mint.Newtonsoft.Json.dll";
 
         const string _mutexGuid = "{DEADMOON-0EFC7B9A-D7FC-437F-B4B3-0118C643FE19-MINT}";
+        internal static Mutex MUTEX;
         static bool _notRunning;
 
         [STAThread]
@@ -36,7 +37,7 @@ static void Main()
             Application.EnableVisualStyles();
             Application.SetCompatibleTextRenderingDefault(false);
 
-            using (Mutex m = new Mutex(true, _mutexGuid, out _notRunning))
+            using (MUTEX = new Mutex(true, _mutexGuid, out _notRunning))
             {
                 if (_notRunning)
                 {
@@ -49,7 +50,7 @@ static void Main()
                 else
                 {
                     MessageBox.Show("Mint is already running in the background!", "Information", MessageBoxButtons.OK, MessageBoxIcon.Information);
-                    Application.Exit();
+                    Environment.Exit(0);
                 }
             }
         }

diff --git a/version.txt b/version.txt
@@ -1 +1 @@
-1.4
+1.5