소스 검색

Fix the issue by resetting the reloading false first and then returning error directly instead of calling Macro

Fix the review comment

Fix the clang format

Update as per review comment
Arti Chhabra 1 개월 전
부모
커밋
e7214c229b
1개의 변경된 파일6개의 추가작업 그리고 1개의 파일을 삭제
  1. 6 1
      modules/gdscript/gdscript.cpp

+ 6 - 1
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;