Przeglądaj źródła

Make closing current scene faster

Tomasz Chabora 5 lat temu
rodzic
commit
5e7f963923
1 zmienionych plików z 5 dodań i 5 usunięć
  1. 5 5
      editor/editor_node.cpp

+ 5 - 5
editor/editor_node.cpp

@@ -2403,11 +2403,13 @@ void EditorNode::_menu_option_confirm(int p_option, bool p_confirmed) {
 			}
 			}
 
 
 		} break;
 		} break;
-		case FILE_CLOSE_ALL_AND_QUIT:
-		case FILE_CLOSE_ALL_AND_RUN_PROJECT_MANAGER:
 		case FILE_CLOSE: {
 		case FILE_CLOSE: {
+			_scene_tab_closed(editor_data.get_edited_scene());
+		} break;
+		case FILE_CLOSE_ALL_AND_QUIT:
+		case FILE_CLOSE_ALL_AND_RUN_PROJECT_MANAGER: {
 			if (!p_confirmed) {
 			if (!p_confirmed) {
-				tab_closing = p_option == FILE_CLOSE ? editor_data.get_edited_scene() : _next_unsaved_scene(false);
+				tab_closing = _next_unsaved_scene(false);
 				_scene_tab_changed(tab_closing);
 				_scene_tab_changed(tab_closing);
 
 
 				if (unsaved_cache || p_option == FILE_CLOSE_ALL_AND_QUIT || p_option == FILE_CLOSE_ALL_AND_RUN_PROJECT_MANAGER) {
 				if (unsaved_cache || p_option == FILE_CLOSE_ALL_AND_QUIT || p_option == FILE_CLOSE_ALL_AND_RUN_PROJECT_MANAGER) {
@@ -2420,8 +2422,6 @@ void EditorNode::_menu_option_confirm(int p_option, bool p_confirmed) {
 						break;
 						break;
 					}
 					}
 				}
 				}
-			} else if (p_option == FILE_CLOSE) {
-				tab_closing = editor_data.get_edited_scene();
 			}
 			}
 			if (!editor_data.get_edited_scene_root(tab_closing)) {
 			if (!editor_data.get_edited_scene_root(tab_closing)) {
 				// empty tab
 				// empty tab