1 files changed, 33 insertions, 9 deletions

diff --git a/platform/web/web_main.cpp b/platform/web/web_main.cpp
index 0f4411727a..fce782b546 100644
--- a/platform/web/web_main.cpp
+++ b/platform/web/web_main.cpp
@@ -41,18 +41,25 @@
 
 static OS_Web *os = nullptr;
 static uint64_t target_ticks = 0;
+static bool main_started = false;
+static bool shutdown_complete = false;
 
 void exit_callback() {
-	emscripten_cancel_main_loop(); // After this, we can exit!
-	Main::cleanup();
+	if (!shutdown_complete) {
+		return; // Still waiting.
+	}
+	if (main_started) {
+		Main::cleanup();
+		main_started = false;
+	}
 	int exit_code = OS_Web::get_singleton()->get_exit_code();
 	memdelete(os);
 	os = nullptr;
-	emscripten_force_exit(exit_code); // No matter that we call cancel_main_loop, regular "exit" will not work, forcing.
+	emscripten_force_exit(exit_code); // Exit runtime.
 }
 
 void cleanup_after_sync() {
-	emscripten_set_main_loop(exit_callback, -1, false);
+	shutdown_complete = true;
 }
 
 void main_loop_callback() {
@@ -65,17 +72,18 @@ void main_loop_callback() {
 		return; // Skip frame.
 	}
 
-	int target_fps = Engine::get_singleton()->get_target_fps();
-	if (target_fps > 0) {
+	int max_fps = Engine::get_singleton()->get_max_fps();
+	if (max_fps > 0) {
 		if (current_ticks - target_ticks > 1000000) {
 			// When the window loses focus, we stop getting updates and accumulate delay.
 			// For this reason, if the difference is too big, we reset target ticks to the current ticks.
 			target_ticks = current_ticks;
 		}
-		target_ticks += (uint64_t)(1000000 / target_fps);
+		target_ticks += (uint64_t)(1000000 / max_fps);
 	}
 	if (os->main_loop_iterate()) {
-		emscripten_cancel_main_loop(); // Cancel current loop and wait for cleanup_after_sync.
+		emscripten_cancel_main_loop(); // Cancel current loop and set the cleanup one.
+		emscripten_set_main_loop(exit_callback, -1, false);
 		godot_js_os_finish_async(cleanup_after_sync);
 	}
 }
@@ -87,7 +95,23 @@ extern EMSCRIPTEN_KEEPALIVE int godot_web_main(int argc, char *argv[]) {
 	// We must override main when testing is enabled
 	TEST_MAIN_OVERRIDE
 
-	Main::setup(argv[0], argc - 1, &argv[1]);
+	Error err = Main::setup(argv[0], argc - 1, &argv[1]);
+
+	// Proper shutdown in case of setup failure.
+	if (err != OK) {
+		int exit_code = (int)err;
+		if (err == ERR_HELP) {
+			exit_code = 0; // Called with --help.
+		}
+		os->set_exit_code(exit_code);
+		// Will only exit after sync.
+		emscripten_set_main_loop(exit_callback, -1, false);
+		godot_js_os_finish_async(cleanup_after_sync);
+		return exit_code;
+	}
+
+	os->set_exit_code(0);
+	main_started = true;
 
 	// Ease up compatibility.
 	ResourceLoader::set_abort_on_missing_resources(false);