summaryrefslogtreecommitdiff
path: root/editor
diff options
context:
space:
mode:
authorEric M <itsjusteza@gmail.com>2021-01-06 11:17:56 +1000
committerEric M <itsjusteza@gmail.com>2021-01-06 12:29:52 +1000
commita54110ba600825319552dd839fd62ebcdb449317 (patch)
tree36bfeaf28a196c0e50cf498f58e7260fe22e4215 /editor
parentcdfcf68af96fa3b9c0e78445e042bc60dff365f7 (diff)
Made save dialog open immediately when running unsaved scene.
Previously there was an unneeded confirmation dialog.
Diffstat (limited to 'editor')
-rw-r--r--editor/editor_node.cpp17
-rw-r--r--editor/editor_node.h1
2 files changed, 4 insertions, 14 deletions
diff --git a/editor/editor_node.cpp b/editor/editor_node.cpp
index 72d9aacef3..ce579febfe 100644
--- a/editor/editor_node.cpp
+++ b/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();
diff --git a/editor/editor_node.h b/editor/editor_node.h
index 0ef2e8cbfc..12aa2a2f5d 100644
--- a/editor/editor_node.h
+++ b/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,