diff options
| author | Rémi Verschelde <rverschelde@gmail.com> | 2019-06-12 12:49:21 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-06-12 12:49:21 +0200 |
| commit | 971b5160c61ccb7a009966d17d339997ea343da3 (patch) | |
| tree | ff0d038213821bbf258f9fa9fd36288a7c7d9bbc /scene/gui | |
| parent | f160c81f683d8a523f23d3c4f7a76151a75fe875 (diff) | |
| parent | 8245db869f05a86e88338236d22765b87cc71db8 (diff) | |
Merge pull request #29306 from qarmin/small_code_fixes
Small fixes to unrechable code, possibly overflows, using NULL pointers
Diffstat (limited to 'scene/gui')
| -rw-r--r-- | scene/gui/tree.cpp | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/scene/gui/tree.cpp b/scene/gui/tree.cpp index 2007ae2669..23b2147875 100644 --- a/scene/gui/tree.cpp +++ b/scene/gui/tree.cpp @@ -318,7 +318,7 @@ void TreeItem::set_custom_draw(int p_column, Object *p_object, const StringName void TreeItem::set_collapsed(bool p_collapsed) { - if (collapsed == p_collapsed) + if (collapsed == p_collapsed || !tree) return; collapsed = p_collapsed; TreeItem *ci = tree->selected_item; @@ -344,8 +344,7 @@ void TreeItem::set_collapsed(bool p_collapsed) { } _changed_notify(); - if (tree) - tree->emit_signal("item_collapsed", this); + tree->emit_signal("item_collapsed", this); } bool TreeItem::is_collapsed() { |