mirror of
https://github.com/godotengine/godot
synced 2024-10-14 16:32:31 +00:00
Merge pull request #36355 from Dodoveloper/master
Fix remembering of an unsaved scene on exit
This commit is contained in:
commit
2a3e771f4c
|
@ -2292,6 +2292,7 @@ void EditorNode::_menu_option_confirm(int p_option, bool p_confirmed) {
|
|||
case FILE_CLOSE: {
|
||||
if (!p_confirmed) {
|
||||
tab_closing = p_option == FILE_CLOSE ? editor_data.get_edited_scene() : _next_unsaved_scene(false);
|
||||
_scene_tab_changed(tab_closing);
|
||||
|
||||
if (unsaved_cache || p_option == FILE_CLOSE_ALL_AND_QUIT || p_option == FILE_CLOSE_ALL_AND_RUN_PROJECT_MANAGER) {
|
||||
String scene_filename = editor_data.get_edited_scene_root(tab_closing)->get_filename();
|
||||
|
@ -2813,6 +2814,10 @@ void EditorNode::_discard_changes(const String &p_str) {
|
|||
_update_scene_tabs();
|
||||
|
||||
if (current_option == FILE_CLOSE_ALL_AND_QUIT || current_option == FILE_CLOSE_ALL_AND_RUN_PROJECT_MANAGER) {
|
||||
// If restore tabs is enabled, reopen the scene that has just been closed, so it's remembered properly.
|
||||
if (bool(EDITOR_GET("interface/scene_tabs/restore_scenes_on_load"))) {
|
||||
_menu_option_confirm(FILE_OPEN_PREV, true);
|
||||
}
|
||||
if (_next_unsaved_scene(false) == -1) {
|
||||
current_option = current_option == FILE_CLOSE_ALL_AND_QUIT ? FILE_QUIT : RUN_PROJECT_MANAGER;
|
||||
_discard_changes();
|
||||
|
|
Loading…
Reference in a new issue