v1.7.0 #2

changelog.txt

@@ -8,6 +8,7 @@ Game Versions: v1.0.x,v1.1.x,v1.2.x,v1.3.x,v1.4.x,v1.5.x
 * Fallback path no longer discards the user's load order on validation failure
 * Fixed Moduel directory opening
 * LauncherEx was switched from OpenGL to DirectX (Why TW?)
+* Fixed infinite loading screen when the Continue button loaded a save with changed modules (#144)
 ---------------------------------------------------------------------------------------------------
 Version: 1.6.7
 Game Versions: v1.0.x,v1.1.x,v1.2.x,v1.3.x,v1.4.x

src/Bannerlord.BLSE/Features/ContinueSaveFile/Patches/SandBoxSubModulePatch.cs

@@ -62,6 +62,12 @@ static void FailedToLoad(string message)
             return true;
         }
 
+        // Skipping the original method also skips its `_latestSaveLoaded = true` re-entry guard.
+        // OnInitialState is invoked again whenever the initial module screen reactivates, so without
+        // the guard a /continuegame launch would load the latest save on top of the running game
+        if (AccessTools2.FieldRefAccess<bool>(sandBoxSubModuleType, "_latestSaveLoaded") is { } latestSaveLoaded)
+            latestSaveLoaded(__instance) = true;
+
         using (var _ = new InformationManagerConfirmInquiryHandler())
             tryLoadSave(saveFile, startGame);
 

src/Bannerlord.BLSE/Features/ContinueSaveFile/Patches/SandBoxViewSubModulePatch.cs

@@ -62,6 +62,12 @@ static void FailedToLoad(string message)
             return true;
         }
 
+        // Skipping the original method also skips its `_latestSaveLoaded = true` re-entry guard.
+        // OnInitialState is invoked again whenever the initial module screen reactivates, so without
+        // the guard a /continuegame launch would load the latest save on top of the running game
+        if (AccessTools2.FieldRefAccess<bool>(sandBoxSubModuleType, "_latestSaveLoaded") is { } latestSaveLoaded)
+            latestSaveLoaded(__instance) = true;
+
         using (var _ = new InformationManagerConfirmInquiryHandler())
             tryLoadSave(saveFile, startGame);
 

src/Bannerlord.LauncherEx/Mixins/LauncherVMMixin.cs

@@ -523,6 +523,10 @@ public void ExecuteStartGameOverride(int mode)
             return;
         }
 
+        // A save file picked in the Saves tab earlier (e.g. a warned load that was cancelled) leaves
+        // /continuesave set; combined with /continuegame it makes the game load two saves at once
+        AsyncContext.Run(() => _launcherManagerHandler.SetGameParameterSaveFileAsync(null));
+
         if (mode == 1)
         {
             AsyncContext.Run(() => _launcherManagerHandler.SetGameParameterContinueLastSaveFileAsync(true));