mirrors/OpenRCT2
1
0
Fork 0
mirror of https://github.com/OpenRCT2/OpenRCT2 synced 2025-12-24 00:03:11 +01:00
Code Issues Releases Wiki Activity

Prevent loading saved games twice in LoadSave window callback (#22305)

Browse Source
This commit is contained in:
Aaron van Geffen
2024-07-15 21:50:53 +02:00
committed by GitHub
parent 5ae97d4d3b
commit d9efdd4cad
2 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
distribution/changelog.txt
View File

@@ -7,6 +7,7 @@
- Feature: [OpenMusic#54] Added Progressive ride music style (feat. Approaching Nirvana). - Feature: [OpenMusic#54] Added Progressive ride music style (feat. Approaching Nirvana).
- Change: [#22230] The plugin/script engine is now initialised off the main thread. - Change: [#22230] The plugin/script engine is now initialised off the main thread.
- Change: [#22251] Hide author info in the scenery window unless debug tools are active. - Change: [#22251] Hide author info in the scenery window unless debug tools are active.
- Fix: [#19210] The load/save window executes the loading code twice, resulting in a slowdown.
- Fix: [#22056] Potential crash upon exiting the game. - Fix: [#22056] Potential crash upon exiting the game.
- Fix: [#22208] Cursor may fail to register hits in some cases (original bug). - Fix: [#22208] Cursor may fail to register hits in some cases (original bug).

1
src/openrct2/Game.cpp
View File

@@ -616,7 +616,6 @@ static void GameLoadOrQuitNoSavePromptCallback(int32_t result, const utf8* path)
GameNotifyMapChange(); GameNotifyMapChange();
GameUnloadScripts(); GameUnloadScripts();
WindowCloseByClass(WindowClass::EditorObjectSelection); WindowCloseByClass(WindowClass::EditorObjectSelection);
GetContext()->LoadParkFromFile(path);
GameLoadScripts(); GameLoadScripts();
GameNotifyMapChanged(); GameNotifyMapChanged();
gIsAutosaveLoaded = gIsAutosave; gIsAutosaveLoaded = gIsAutosave;