Merge pull request #32 from Windows10CE/move-updater-check

Fix using Model after update ends
LavaGang · Nov 21, 2024 · 3bf2ea6 · 3bf2ea6
2 parents 0af97c3 + 9d37797
commit 3bf2ea6
Showing 1 changed file with 7 additions and 3 deletions.
diff --git a/MelonLoader.Installer/Views/MainView.axaml.cs b/MelonLoader.Installer/Views/MainView.axaml.cs
@@ -27,7 +27,10 @@ protected override async void OnDataContextChanged(EventArgs e)
         if (Updater.State == Updater.UpdateState.None)
         {
             Model.Ready = false;
-            await DoInit();
+            if (!await DoInit())
+            {
+                return;
+            }
             Model.Ready = true;
         }
 
@@ -44,7 +47,7 @@ protected override async void OnDataContextChanged(EventArgs e)
         }
     }
 
-    private static async Task DoInit()
+    private static async Task<bool> DoInit()
     {
         try
         {
@@ -53,14 +56,15 @@ private static async Task DoInit()
             if (await checkUpdate is { } updateTask)
             {
                 _ = MainWindow.Instance.HandleUpdate(updateTask);
-                return;
+                return false;
             }
             await otherInit;
         }
         catch (Exception ex)
         {
             CrashException(ex);
         }
+        return true;
     }
 
     private static void CrashException(Exception ex)