mirrors
/
OpenTTD
mirror of https://github.com/OpenTTD/OpenTTD.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

Codechange: [Emscripten] Improve syncfs synchronisation on exit/abort

This commit is contained in:
glx22 2023-07-06 18:18:03 +02:00 committed by Loïc Guilloux
parent 75d3dc0a19
commit 3d1c4a8589
3 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
os/emscripten/pre.js
View File

@ -52,24 +52,26 @@ Module.preRun.push(function() {
});
window.openttd_syncfs_shown_warning = false;
window.openttd_syncfs = function() {
window.openttd_syncfs = function(callback) {
/* Copy the virtual FS to the persistent storage. */
FS.syncfs(false, function (err) { });
FS.syncfs(false, function (err) {
/* On first time, warn the user about the volatile behaviour of
* persistent storage. */
if (!window.openttd_syncfs_shown_warning) {
window.openttd_syncfs_shown_warning = true;
Module.onWarningFs();
}
/* On first time, warn the user about the volatile behaviour of
* persistent storage. */
if (!window.openttd_syncfs_shown_warning) {
window.openttd_syncfs_shown_warning = true;
Module.onWarningFs();
}
if (callback) callback();
});
}
window.openttd_exit = function() {
Module.onExit();
window.openttd_syncfs(Module.onExit);
}
window.openttd_abort = function() {
Module.onAbort();
window.openttd_syncfs(Module.onAbort);
}
window.openttd_server_list = function() {

1
src/openttd.cpp
View File

@ -118,7 +118,6 @@ void UserErrorI(const std::string &str)
/* In effect, the game ends here. As emscripten_set_main_loop() caused
* the stack to be unwound, the code after MainLoop() in
* openttd_main() is never executed. */
EM_ASM(if (window["openttd_syncfs"]) openttd_syncfs());
EM_ASM(if (window["openttd_abort"]) openttd_abort());
#endif

1
src/video/sdl2_v.cpp
View File

@ -615,7 +615,6 @@ void VideoDriver_SDL_Base::LoopOnce()
/* In effect, the game ends here. As emscripten_set_main_loop() caused
* the stack to be unwound, the code after MainLoop() in
* openttd_main() is never executed. */
EM_ASM(if (window["openttd_syncfs"]) openttd_syncfs());
EM_ASM(if (window["openttd_exit"]) openttd_exit());
#endif
return;