diff options
| -rw-r--r-- | tools/editor/editor_node.cpp | 21 | ||||
| -rw-r--r-- | tools/editor/editor_node.h | 1 |
2 files changed, 16 insertions, 6 deletions
diff --git a/tools/editor/editor_node.cpp b/tools/editor/editor_node.cpp index 34e2510791..a3d7cbd7cf 100644 --- a/tools/editor/editor_node.cpp +++ b/tools/editor/editor_node.cpp @@ -2946,6 +2946,20 @@ void EditorNode::_remove_edited_scene() { unsaved_cache=false; } } + +void EditorNode::_remove_scene(int index) { +// printf("Attempting to remove scene %d (current is %d)\n", index, editor_data.get_edited_scene()); + if (editor_data.get_edited_scene() == index) { + //Scene to remove is current scene + _remove_edited_scene(); + } + else { + // Scene to remove is not active scene."); + editor_data.remove_scene(index); + editor_data.get_undo_redo().clear_history(); + } +} + void EditorNode::set_edited_scene(Node *p_scene) { if (get_editor_data().get_edited_scene_root()) { @@ -4390,12 +4404,7 @@ void EditorNode::_scene_tab_script_edited(int p_tab) { } void EditorNode::_scene_tab_closed(int p_tab) { - set_current_scene(p_tab); - bool p_confirmed = true; - if (unsaved_cache) - p_confirmed = false; - - _menu_option_confirm(FILE_CLOSE, p_confirmed); + _remove_scene(p_tab); _update_scene_tabs(); } diff --git a/tools/editor/editor_node.h b/tools/editor/editor_node.h index 978e8390dc..56e455c9c0 100644 --- a/tools/editor/editor_node.h +++ b/tools/editor/editor_node.h @@ -461,6 +461,7 @@ class EditorNode : public Node { void _cleanup_scene(); void _remove_edited_scene(); + void _remove_scene(int index); bool _find_and_save_resource(RES p_res,Map<RES,bool>& processed,int32_t flags); bool _find_and_save_edited_subresources(Object *obj,Map<RES,bool>& processed,int32_t flags); void _save_edited_subresources(Node* scene,Map<RES,bool>& processed,int32_t flags); |