From b277a2985d81efd4e15d8606ddd6ee12db0b2ed1 Mon Sep 17 00:00:00 2001 From: kobewi Date: Thu, 19 Sep 2024 15:57:02 +0200 Subject: [PATCH] Don't store project metadata when loading --- editor/action_map_editor.cpp | 2 +- editor/editor_node.cpp | 15 +++++++++++---- editor/project_settings_editor.cpp | 2 +- 3 files changed, 13 insertions(+), 6 deletions(-) diff --git a/editor/action_map_editor.cpp b/editor/action_map_editor.cpp index 16423fb111f..e08f2fcf65b 100644 --- a/editor/action_map_editor.cpp +++ b/editor/action_map_editor.cpp @@ -588,7 +588,7 @@ ActionMapEditor::ActionMapEditor() { add_hbox->add_child(show_builtin_actions_checkbutton); show_builtin_actions = EditorSettings::get_singleton()->get_project_metadata("project_settings", "show_builtin_actions", false); - show_builtin_actions_checkbutton->set_pressed(show_builtin_actions); + show_builtin_actions_checkbutton->set_pressed_no_signal(show_builtin_actions); main_vbox->add_child(add_hbox); diff --git a/editor/editor_node.cpp b/editor/editor_node.cpp index 0c21f3c2cd6..2c474c3c701 100644 --- a/editor/editor_node.cpp +++ b/editor/editor_node.cpp @@ -4113,7 +4113,9 @@ Error EditorNode::load_scene(const String &p_scene, bool p_ignore_broken_deps, b _update_title(); scene_tabs->update_scene_tabs(); - _add_to_recent_scenes(lpath); + if (!restoring_scenes) { + _add_to_recent_scenes(lpath); + } return OK; } @@ -7906,9 +7908,14 @@ EditorNode::EditorNode() { title_bar->set_can_move_window(true); } - String exec = OS::get_singleton()->get_executable_path(); - // Save editor executable path for third-party tools. - EditorSettings::get_singleton()->set_project_metadata("editor_metadata", "executable_path", exec); + { + const String exec = OS::get_singleton()->get_executable_path(); + const String old_exec = EditorSettings::get_singleton()->get_project_metadata("editor_metadata", "executable_path", ""); + // Save editor executable path for third-party tools. + if (exec != old_exec) { + EditorSettings::get_singleton()->set_project_metadata("editor_metadata", "executable_path", exec); + } + } follow_system_theme = EDITOR_GET("interface/theme/follow_system_theme"); use_system_accent_color = EDITOR_GET("interface/theme/use_system_accent_color"); diff --git a/editor/project_settings_editor.cpp b/editor/project_settings_editor.cpp index 489fbb037ff..95952f9b87a 100644 --- a/editor/project_settings_editor.cpp +++ b/editor/project_settings_editor.cpp @@ -771,7 +771,7 @@ ProjectSettingsEditor::ProjectSettingsEditor(EditorData *p_data) { bool use_advanced = EditorSettings::get_singleton()->get_project_metadata("project_settings", "advanced_mode", false); if (use_advanced) { - advanced->set_pressed(true); + advanced->set_pressed_no_signal(true); } _update_advanced(use_advanced);