diff options
author | Juan Linietsky <reduzio@gmail.com> | 2016-06-13 22:24:11 -0300 |
---|---|---|
committer | Juan Linietsky <reduzio@gmail.com> | 2016-06-13 22:24:11 -0300 |
commit | 944c7e26038ff82c4666fa2c3814c612ef576761 (patch) | |
tree | c0194e0dd355b1e8e7993ed5116115ec42e46f5b /scene/gui | |
parent | 64b4253dbfe3fdfc4efa405086d23765a9774d91 (diff) |
fix crash when clearing dynamicfontdata, closes #4877
Diffstat (limited to 'scene/gui')
-rw-r--r-- | scene/gui/control.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/scene/gui/control.cpp b/scene/gui/control.cpp index b122ab4183..666ac88055 100644 --- a/scene/gui/control.cpp +++ b/scene/gui/control.cpp @@ -1844,7 +1844,7 @@ void Control::_propagate_theme_changed(CanvasItem *p_at,Control *p_owner) { Control *c = p_at->cast_to<Control>(); - if (c && c->data.theme.is_valid()) // has a theme, this can't be propagated + if (c && c!=p_owner && c->data.theme.is_valid()) // has a theme, this can't be propagated return; for(int i=0;i<p_at->get_child_count();i++) { |