asgardius/virtualx-engine
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #73459 from rsjtdrjgfuzkfg/theme-crash

Browse source 
Theme Editor: fix crash when editing leading/main-style style boxes
This commit is contained in:
Rémi Verschelde 2023-02-17 00:32:06 +01:00
commit 4cc885148c
No known key found for this signature in database
GPG key ID: C3336907360768E1
1 changed files with 6 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
editor/plugins/theme_editor_plugin.cpp
View file

@ -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>());
}
}