diff options
| author | Rémi Verschelde <remi@verschelde.fr> | 2021-01-18 12:40:17 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-01-18 12:40:17 +0100 |
| commit | 688f4aebef57e77e843b52cfb97c31f3ea426c0e (patch) | |
| tree | 5ad600eab6aec385db1f8da03c9b850fd29cce26 /editor | |
| parent | 5496174dd40b61a6cfb7d55639820703480846b7 (diff) | |
| parent | 682640083ef3857d5604b07de62ca812ee724584 (diff) | |
Merge pull request #32321 from Calinou/editor-disable-quit-confirmation
Remove the editor quit confirmation when there are no unsaved changes
Diffstat (limited to 'editor')
| -rw-r--r-- | editor/editor_node.cpp | 12 | ||||
| -rw-r--r-- | editor/editor_settings.cpp | 1 |
2 files changed, 2 insertions, 11 deletions
diff --git a/editor/editor_node.cpp b/editor/editor_node.cpp index e3d7f67d4a..ddd9494fdd 100644 --- a/editor/editor_node.cpp +++ b/editor/editor_node.cpp @@ -2598,15 +2598,8 @@ void EditorNode::_menu_option_confirm(int p_option, bool p_confirmed) { if (!p_confirmed) { bool save_each = EDITOR_GET("interface/editor/save_each_scene_on_quit"); if (_next_unsaved_scene(!save_each) == -1) { - bool confirm = EDITOR_GET("interface/editor/quit_confirmation"); - if (confirm) { - confirmation->get_ok_button()->set_text(p_option == FILE_QUIT ? TTR("Quit") : TTR("Yes")); - confirmation->set_text(p_option == FILE_QUIT ? TTR("Exit the editor?") : TTR("Open Project Manager?")); - confirmation->popup_centered(); - } else { - _discard_changes(); - break; - } + _discard_changes(); + break; } else { if (save_each) { _menu_option_confirm(p_option == FILE_QUIT ? FILE_CLOSE_ALL_AND_QUIT : FILE_CLOSE_ALL_AND_RUN_PROJECT_MANAGER, false); @@ -5760,7 +5753,6 @@ EditorNode::EditorNode() { EDITOR_DEF("run/output/always_close_output_on_stop", true); EDITOR_DEF("run/auto_save/save_before_running", true); EDITOR_DEF_RST("interface/editor/save_each_scene_on_quit", true); - EDITOR_DEF("interface/editor/quit_confirmation", true); EDITOR_DEF("interface/editor/show_update_spinner", false); EDITOR_DEF("interface/editor/update_continuously", false); EDITOR_DEF_RST("interface/scene_tabs/restore_scenes_on_load", false); diff --git a/editor/editor_settings.cpp b/editor/editor_settings.cpp index d9f305b20a..6683867e1d 100644 --- a/editor/editor_settings.cpp +++ b/editor/editor_settings.cpp @@ -357,7 +357,6 @@ void EditorSettings::_load_defaults(Ref<ConfigFile> p_extra_config) { hints["interface/editor/single_window_mode"] = PropertyInfo(Variant::BOOL, "interface/editor/single_window_mode", PROPERTY_HINT_NONE, "", PROPERTY_USAGE_DEFAULT | PROPERTY_USAGE_RESTART_IF_CHANGED); _initial_set("interface/editor/hide_console_window", false); _initial_set("interface/editor/save_each_scene_on_quit", true); // Regression - _initial_set("interface/editor/quit_confirmation", true); // Theme _initial_set("interface/theme/preset", "Default"); |