diff options
author | Rémi Verschelde <remi@verschelde.fr> | 2021-06-29 12:00:03 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2021-06-29 12:00:03 +0200 |
commit | 8597db0ac2368f8c62c11099faa273f1b9311548 (patch) | |
tree | 2bd262fec7a146462b70902f95924b3ecc67625b | |
parent | a24f494861df01f2649d5e907da7cc519972b950 (diff) | |
parent | 538a50ac19c78e89c2019be25569b4f363514957 (diff) |
Merge pull request #49980 from EricEzaM/fix-default-log-state
EditorLog filter buttons are now enabled/on by default
-rw-r--r-- | editor/editor_log.cpp | 23 |
1 files changed, 11 insertions, 12 deletions
diff --git a/editor/editor_log.cpp b/editor/editor_log.cpp index 437de97332..b3e90236a6 100644 --- a/editor/editor_log.cpp +++ b/editor/editor_log.cpp @@ -123,21 +123,20 @@ void EditorLog::_load_state() { Ref<ConfigFile> config; config.instantiate(); - Error err = config->load(EditorSettings::get_singleton()->get_project_settings_dir().plus_file("editor_layout.cfg")); - - if (err == OK) { - const String section = "editor_log"; - for (Map<MessageType, LogFilter *>::Element *E = type_filter_map.front(); E; E = E->next()) { - E->get()->set_active(config->get_value(section, "log_filter_" + itos(E->key()), false)); - } + config->load(EditorSettings::get_singleton()->get_project_settings_dir().plus_file("editor_layout.cfg")); - collapse = config->get_value(section, "collapse", false); - collapse_button->set_pressed(collapse); - bool show_search = config->get_value(section, "show_search", true); - search_box->set_visible(show_search); - show_search_button->set_pressed(show_search); + // Run the below code even if config->load returns an error, since we want the defaults to be set even if the file does not exist yet. + const String section = "editor_log"; + for (Map<MessageType, LogFilter *>::Element *E = type_filter_map.front(); E; E = E->next()) { + E->get()->set_active(config->get_value(section, "log_filter_" + itos(E->key()), true)); } + collapse = config->get_value(section, "collapse", false); + collapse_button->set_pressed(collapse); + bool show_search = config->get_value(section, "show_search", true); + search_box->set_visible(show_search); + show_search_button->set_pressed(show_search); + is_loading_state = false; } |