Browse Source

Fix custom built-in script names

kobewi 3 years ago
parent
commit
6eb1c92cea

+ 1 - 1
editor/plugins/script_text_editor.cpp

@@ -528,7 +528,7 @@ String ScriptTextEditor::get_name() {
 	if (name.empty()) {
 	if (name.empty()) {
 		// This appears for newly created built-in scripts before saving the scene.
 		// This appears for newly created built-in scripts before saving the scene.
 		name = TTR("[unsaved]");
 		name = TTR("[unsaved]");
-	} else if (script->get_path().find("local://") == -1 && script->get_path().find("::") == -1) {
+	} else if (script->get_path().find("local://") == -1 || script->get_path().find("::") == -1) {
 		const String &script_name = script->get_name();
 		const String &script_name = script->get_name();
 		if (script_name != "") {
 		if (script_name != "") {
 			// If the built-in script has a custom resource name defined,
 			// If the built-in script has a custom resource name defined,

+ 1 - 1
editor/plugins/text_editor.cpp

@@ -154,7 +154,7 @@ String TextEditor::get_name() {
 	if (name.empty()) {
 	if (name.empty()) {
 		// This appears for newly created built-in text_files before saving the scene.
 		// This appears for newly created built-in text_files before saving the scene.
 		name = TTR("[unsaved]");
 		name = TTR("[unsaved]");
-	} else if (text_file->get_path().find("local://") == -1 && text_file->get_path().find("::") == -1) {
+	} else if (text_file->get_path().find("local://") == -1 || text_file->get_path().find("::") == -1) {
 		const String &text_file_name = text_file->get_name();
 		const String &text_file_name = text_file->get_name();
 		if (text_file_name != "") {
 		if (text_file_name != "") {
 			// If the built-in text_file has a custom resource name defined,
 			// If the built-in text_file has a custom resource name defined,

+ 1 - 1
modules/visual_script/visual_script_editor.cpp

@@ -2485,7 +2485,7 @@ String VisualScriptEditor::get_name() {
 	if (name.empty()) {
 	if (name.empty()) {
 		// This appears for newly created built-in scripts before saving the scene.
 		// This appears for newly created built-in scripts before saving the scene.
 		name = TTR("[unsaved]");
 		name = TTR("[unsaved]");
-	} else if (script->get_path().find("local://") == -1 && script->get_path().find("::") == -1) {
+	} else if (script->get_path().find("local://") == -1 || script->get_path().find("::") == -1) {
 		const String &script_name = script->get_name();
 		const String &script_name = script->get_name();
 		if (script_name != "") {
 		if (script_name != "") {
 			// If the built-in script has a custom resource name defined,
 			// If the built-in script has a custom resource name defined,