ソースを参照

Merge pull request #53148 from Shatur/fix-register-singleton

Fix inversed check inside register_singleton
Rémi Verschelde 4 年 前
コミット
8abd46096a
1 ファイル変更1 行追加1 行削除
  1. 1 1
      core/core_bind.cpp

+ 1 - 1
core/core_bind.cpp

@@ -2221,7 +2221,7 @@ Object *Engine::get_singleton_object(const StringName &p_name) const {
 
 
 void Engine::register_singleton(const StringName &p_name, Object *p_object) {
 void Engine::register_singleton(const StringName &p_name, Object *p_object) {
 	ERR_FAIL_COND_MSG(has_singleton(p_name), "Singleton already registered: " + String(p_name));
 	ERR_FAIL_COND_MSG(has_singleton(p_name), "Singleton already registered: " + String(p_name));
-	ERR_FAIL_COND_MSG(p_name.operator String().is_valid_identifier(), "Singleton name is not a valid identifier: " + String(p_name));
+	ERR_FAIL_COND_MSG(!String(p_name).is_valid_identifier(), "Singleton name is not a valid identifier: " + p_name);
 	::Engine::Singleton s;
 	::Engine::Singleton s;
 	s.class_name = p_name;
 	s.class_name = p_name;
 	s.name = p_name;
 	s.name = p_name;