diff options
| author | Rémi Verschelde <rverschelde@gmail.com> | 2023-02-17 00:32:06 +0100 |
|---|---|---|
| committer | Rémi Verschelde <rverschelde@gmail.com> | 2023-02-17 00:32:06 +0100 |
| commit | 4cc885148cfd826b9eec275d66328f323b6e99a5 (patch) | |
| tree | 6b91a8f4470da3117651efe493ec3cd75eb18c00 | |
| parent | 68807165f40ff6fe6b2b9802f4ce914a0536d62a (diff) | |
| parent | 331dd33009289915619bb1ab7d76d156d951183a (diff) | |
Merge pull request #73459 from rsjtdrjgfuzkfg/theme-crash
Theme Editor: fix crash when editing leading/main-style style boxes
| -rw-r--r-- | editor/plugins/theme_editor_plugin.cpp | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/editor/plugins/theme_editor_plugin.cpp b/editor/plugins/theme_editor_plugin.cpp index 073adb467a..2519928ea3 100644 --- a/editor/plugins/theme_editor_plugin.cpp +++ b/editor/plugins/theme_editor_plugin.cpp @@ -3223,6 +3223,7 @@ void ThemeTypeEditor::_update_stylebox_from_leading() { if (!leading_stylebox.pinned || leading_stylebox.stylebox.is_null()) { return; } + ERR_FAIL_COND_MSG(edited_theme.is_null(), "Leading stylebox does not have an edited theme to update"); // Prevent changes from immediately being reported while the operation is still ongoing. edited_theme->_freeze_change_propagation(); @@ -3706,7 +3707,11 @@ void ThemeEditorPlugin::edit(Object *p_node) { if (Object::cast_to<Theme>(p_node)) { theme_editor->edit(Object::cast_to<Theme>(p_node)); } else { - theme_editor->edit(Ref<Theme>()); + // We intentionally keep a reference to the last used theme to work around + // the the editor being hidden while base resources are edited. Uncomment + // the following line again and remove this comment once that bug has been + // fixed (scheduled for Godot 4.1 in PR 73098): + // theme_editor->edit(Ref<Theme>()); } } |