Fixes a crash when creating a script which inherits from a class defi…

…ned with class_name
V-Sekai · Aug 9, 2021 · 002eace · 002eace
1 parent e010e05
commit 002eace
Showing 1 changed file with 2 additions and 1 deletion.
diff --git a/modules/gdscript/gdscript_compiler.cpp b/modules/gdscript/gdscript_compiler.cpp
@@ -107,7 +107,8 @@ GDScriptDataType GDScriptCompiler::_gdtype_from_datatype(const GDScriptParser::D
 			// Locate class by constructing the path to it and following that path
 			GDScriptParser::ClassNode *class_type = p_datatype.class_type;
 			if (class_type) {
-				if (class_type->fqcn.begins_with(main_script->path) || (!main_script->name.is_empty() && class_type->fqcn.begins_with(main_script->name))) {
+				if ((!main_script->path.is_empty() && class_type->fqcn.begins_with(main_script->path) ||
+					(!main_script->name.is_empty() && class_type->fqcn.begins_with(main_script->name)))) {
 					// Local class.
 					List<StringName> names;
 					while (class_type->outer) {