Browse Source

Merge pull request #44952 from EricEzaM/PR/update-run-scene-save-dialog

Made save dialog open immediately when running unsaved scene.
Rémi Verschelde 4 years ago
parent
commit
89a83a8af2
2 changed files with 4 additions and 14 deletions
  1. 4 13
      editor/editor_node.cpp
  2. 0 1
      editor/editor_node.h

+ 4 - 13
editor/editor_node.cpp

@@ -2123,7 +2123,10 @@ void EditorNode::_run(bool p_current, const String &p_custom) {
 
 		if (scene->get_filename() == "") {
 			current_option = -1;
-			_menu_option_confirm(FILE_SAVE_BEFORE_RUN, false);
+			_menu_option(FILE_SAVE_AS_SCENE);
+			// Set the option to save and run so when the dialog is accepted, the scene runs.
+			current_option = FILE_SAVE_AND_RUN;
+			file->set_title(TTR("Save scene before running..."));
 			return;
 		}
 
@@ -2382,18 +2385,6 @@ void EditorNode::_menu_option_confirm(int p_option, bool p_confirmed) {
 		case FILE_SAVE_ALL_SCENES: {
 			_save_all_scenes();
 		} break;
-		case FILE_SAVE_BEFORE_RUN: {
-			if (!p_confirmed) {
-				confirmation->get_cancel_button()->set_text(TTR("No"));
-				confirmation->get_ok_button()->set_text(TTR("Yes"));
-				confirmation->set_text(TTR("This scene has never been saved. Save before running?"));
-				confirmation->popup_centered();
-				break;
-			}
-
-			_menu_option(FILE_SAVE_AS_SCENE);
-			_menu_option_confirm(FILE_SAVE_AND_RUN, false);
-		} break;
 
 		case FILE_EXPORT_PROJECT: {
 			project_export->popup_export();

+ 0 - 1
editor/editor_node.h

@@ -125,7 +125,6 @@ private:
 		FILE_SAVE_SCENE,
 		FILE_SAVE_AS_SCENE,
 		FILE_SAVE_ALL_SCENES,
-		FILE_SAVE_BEFORE_RUN,
 		FILE_SAVE_AND_RUN,
 		FILE_SHOW_IN_FILESYSTEM,
 		FILE_IMPORT_SUBSCENE,