diff options
| author | Marcelo Fernandez | 2018-03-03 20:46:36 -0300 |
|---|---|---|
| committer | Marcelo Fernandez | 2018-03-03 20:47:57 -0300 |
| commit | 2f1429eb24705410bcfb1c106fe12160e444cc37 (patch) | |
| tree | 2055460793e963a3297dd7d5c158a081dbab3ed1 /editor/editor_themes.cpp | |
| parent | cf0bc13588a28401058d744abd6673c6974377eb (diff) | |
| download | godot-2f1429eb24705410bcfb1c106fe12160e444cc37.tar.gz godot-2f1429eb24705410bcfb1c106fe12160e444cc37.tar.zst godot-2f1429eb24705410bcfb1c106fe12160e444cc37.zip | |
Fix for a possible crash when a custom theme is not loaded properly
Diffstat (limited to '')
| -rw-r--r-- | editor/editor_themes.cpp | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/editor/editor_themes.cpp b/editor/editor_themes.cpp index 096a60afa..b10f785a2 100644 --- a/editor/editor_themes.cpp +++ b/editor/editor_themes.cpp @@ -1139,7 +1139,9 @@ Ref<Theme> create_custom_theme(const Ref<Theme> p_theme) { String custom_theme = EditorSettings::get_singleton()->get("interface/theme/custom_theme"); if (custom_theme != "") { theme = ResourceLoader::load(custom_theme); - } else { + } + + if (!theme.is_valid()) { theme = create_editor_theme(p_theme); } |