summaryrefslogtreecommitdiff
path: root/editor
diff options
context:
space:
mode:
authorRĂ©mi Verschelde <rverschelde@gmail.com>2018-09-16 01:41:13 +0200
committerGitHub <noreply@github.com>2018-09-16 01:41:13 +0200
commit787be50f1760be541e97b18a371abccc9c9b1ac9 (patch)
tree9f6484bd2f6c20c752436765745b8f4208579b0d /editor
parent68e1ef49b1fccd1370f9b865a9d0d6bff8edf83e (diff)
parentdf2af46a41176a489f0d701f09dd39ceb9690c4b (diff)
Merge pull request #22117 from Paulb23/colour_theme_crash_issue_21715
Fix crash on colour theme change, issue 21715
Diffstat (limited to 'editor')
-rw-r--r--editor/settings_config_dialog.cpp6
1 files changed, 1 insertions, 5 deletions
diff --git a/editor/settings_config_dialog.cpp b/editor/settings_config_dialog.cpp
index 97cdd43fee..fe384da75b 100644
--- a/editor/settings_config_dialog.cpp
+++ b/editor/settings_config_dialog.cpp
@@ -56,11 +56,7 @@ void EditorSettingsDialog::_settings_property_edited(const String &p_name) {
String full_name = inspector->get_full_item_path(p_name);
- // Small usability workaround to update the text color settings when the
- // color theme is changed
- if (full_name == "text_editor/theme/color_theme") {
- inspector->get_inspector()->update_tree();
- } else if (full_name == "interface/theme/accent_color" || full_name == "interface/theme/base_color" || full_name == "interface/theme/contrast") {
+ if (full_name == "interface/theme/accent_color" || full_name == "interface/theme/base_color" || full_name == "interface/theme/contrast") {
EditorSettings::get_singleton()->set_manually("interface/theme/preset", "Custom"); // set preset to Custom
} else if (full_name.begins_with("text_editor/highlighting")) {
EditorSettings::get_singleton()->set_manually("text_editor/theme/color_theme", "Custom");