Merge pull request #109442 from archhabra/godotengine_107869

Fix `GDScript::reload` leaving `reloading` as `true` on failure
2025-08-21 18:39:34 -05:00
parent 88c8efe6ed e7214c229b
commit 84a3881120
1 changed files with 6 additions and 1 deletions
--- a/modules/gdscript/gdscript.cpp
+++ b/modules/gdscript/gdscript.cpp
@ -755,7 +755,12 @@ Error GDScript::reload(bool p_keep_state) {
 		has_instances = instances.size();
 	}

-	ERR_FAIL_COND_V(!p_keep_state && has_instances, ERR_ALREADY_IN_USE);
+	// Check condition but reset flag before early return
+	if (!p_keep_state && has_instances) {
+		reloading = false; // Reset flag before returning
+
+		ERR_FAIL_V_MSG(ERR_ALREADY_IN_USE, "Cannot reload script while instances exist.");
+	}

 	String basedir = path;