diff options
Diffstat (limited to 'editor/rename_dialog.cpp')
| -rw-r--r-- | editor/rename_dialog.cpp | 7 | 
1 files changed, 5 insertions, 2 deletions
diff --git a/editor/rename_dialog.cpp b/editor/rename_dialog.cpp index 48aa0471c9..0f15d4b119 100644 --- a/editor/rename_dialog.cpp +++ b/editor/rename_dialog.cpp @@ -434,7 +434,10 @@ String RenameDialog::_substitute(const String &subject, const Node *node, int co  	}  	int current = EditorNode::get_singleton()->get_editor_data().get_edited_scene(); -	result = result.replace("${SCENE}", EditorNode::get_singleton()->get_editor_data().get_scene_title(current)); +	// Always request the scene title with the extension stripped. +	// Otherwise, the result could vary depending on whether a scene with the same name +	// (but different extension) is currently open. +	result = result.replace("${SCENE}", EditorNode::get_singleton()->get_editor_data().get_scene_title(current, true));  	Node *root_node = SceneTree::get_singleton()->get_edited_scene_root();  	if (root_node) { @@ -629,7 +632,7 @@ void RenameDialog::_insert_text(String text) {  	if (_is_main_field(focus_owner)) {  		focus_owner->selection_delete(); -		focus_owner->append_at_cursor(text); +		focus_owner->insert_text_at_caret(text);  		_update_preview();  	}  }  |