Fixed issue with running ModAssistant.old.exe

knah · Feb 27, 2020 · eb2ab28 · eb2ab28
1 parent 97d98b8
commit eb2ab28
Showing 1 changed file with 10 additions and 8 deletions.
diff --git a/ModAssistant/Classes/Updater.cs b/ModAssistant/Classes/Updater.cs
@@ -15,6 +15,7 @@ class Updater
         private static Version CurrentVersion;
         private static Version LatestVersion;
         private static bool NeedsUpdate = false;
+        private static string NewExe = Path.Combine(Path.GetDirectoryName(Utils.ExePath), "ModAssistant.exe");
 
         public static async Task<bool> CheckForUpdate()
         {
@@ -30,6 +31,7 @@ public static async Task<bool> CheckForUpdate()
 
         public static async Task Run()
         {
+            if (Path.GetFileName(Utils.ExePath).Equals("ModAssistant.old.exe")) RunNew();
             try
             {
                 NeedsUpdate = await CheckForUpdate();
@@ -44,9 +46,7 @@ public static async Task Run()
 
         public static async Task StartUpdate()
         {
-            string Directory = Path.GetDirectoryName(Utils.ExePath);
-            string OldExe = Path.Combine(Directory, "ModAssistant.old.exe");
-
+            string OldExe = Path.Combine(Path.GetDirectoryName(Utils.ExePath), "ModAssistant.old.exe");
             string DownloadLink = null;
 
             foreach (Update.Asset asset in LatestUpdate.assets)
@@ -70,14 +70,16 @@ public static async Task StartUpdate()
 
                 File.Move(Utils.ExePath, OldExe);
 
-                await Utils.Download(DownloadLink, Utils.ExePath);
-                Process.Start(Utils.ExePath);
-                App.Current.Shutdown();
-
+                await Utils.Download(DownloadLink, NewExe);
+                RunNew();
             }
-
         }
 
+        private static void RunNew()
+        {
+            Process.Start(NewExe);
+            Application.Current.Dispatcher.Invoke(() => { Application.Current.Shutdown(); });
+        }
     }
 
     public class Update