Emscripten: Fix async crashes when switching the language

Works by delaying the scene switch by one frame so async can suspend the current scene.
EasyRPG · Feb 24, 2025 · 1dcd51e · 1dcd51e
1 parent 413c9bd
commit 1dcd51e
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 5 deletions.
diff --git a/src/scene_language.cpp b/src/scene_language.cpp
@@ -40,10 +40,6 @@
 #include "window_settings.h"
 #include <memory>
 
-#ifdef EMSCRIPTEN
-#  include <emscripten.h>
-#endif
-
 Scene_Language::Scene_Language() {
 	Scene::type = Scene::LanguageMenu;
 }
@@ -125,6 +121,11 @@ void Scene_Language::Start() {
 
 
 void Scene_Language::vUpdate() {
+	if (shutdown) {
+		PopOrTitle();
+		return;
+	}
+
 	translate_window->Update();
 	help_window->Update();
 
@@ -144,6 +145,10 @@ void Scene_Language::vUpdate() {
 	}
 }
 
+void Scene_Language::OnTranslationChanged() {
+	Main_Data::game_system->ReloadSystemGraphic();
+}
+
 void Scene_Language::OnTitleSpriteReady(FileRequestResult* result) {
 	BitmapRef bitmapRef = Cache::Title(result->file);
 
@@ -169,8 +174,11 @@ void Scene_Language::ChangeLanguage(const std::string& lang_str) {
 
 	// First change the language
 	Player::translation.SelectLanguage(lang_str);
+	Main_Data::game_system->ReloadSystemGraphic();
 
-	PopOrTitle();
+	// Delay scene shutdown by one frame to allow async requests for language change
+	// and system graphic reload to finish before the scene switches
+	shutdown = true;
 }
 
 void Scene_Language::PopOrTitle() {

diff --git a/src/scene_language.h b/src/scene_language.h
@@ -45,6 +45,8 @@ class Scene_Language : public Scene {
 	void Start() override;
 	void vUpdate() override;
 
+	void OnTranslationChanged() override;
+
 private:
 
 	/**
@@ -83,6 +85,7 @@ class Scene_Language : public Scene {
 	std::unique_ptr<Sprite> title;
 	FileRequestBinding request_id;
 	int input_reset_counter = 0;
+	bool shutdown = false;
 
 	Window_Settings::UiMode mode = Window_Settings::eNone;
 };

diff --git a/src/scene_settings.cpp b/src/scene_settings.cpp
@@ -260,6 +260,7 @@ void Scene_Settings::vUpdate() {
 		case Window_Settings::eSave:
 		case Window_Settings::eEnd:
 		case Window_Settings::eAbout:
+		case Window_Settings::eLanguage: // fix compiler warning, not implemented
 			break;
 		case Window_Settings::eMain:
 			UpdateMain();