Sfoglia il codice sorgente

Fix a crash in editor's script parent class check

(cherry picked from commit 62c34a6be739cf8b243c03ca2be40d56fcc660c7)
Yuri Sizov 3 anni fa
parent
commit
2b9a1e0d2c
1 ha cambiato i file con 6 aggiunte e 1 eliminazioni
  1. 6 1
      editor/editor_data.cpp

+ 6 - 1
editor/editor_data.cpp

@@ -869,8 +869,13 @@ bool EditorData::script_class_is_parent(const String &p_class, const String &p_i
 	if (!ScriptServer::is_global_class(p_class)) {
 	if (!ScriptServer::is_global_class(p_class)) {
 		return false;
 		return false;
 	}
 	}
-	String base = script_class_get_base(p_class);
+
 	Ref<Script> script = script_class_load_script(p_class);
 	Ref<Script> script = script_class_load_script(p_class);
+	if (script.is_null()) {
+		return false;
+	}
+
+	String base = script_class_get_base(p_class);
 	Ref<Script> base_script = script->get_base_script();
 	Ref<Script> base_script = script->get_base_script();
 
 
 	while (p_inherits != base) {
 	while (p_inherits != base) {