From fb32adfcf8baa38b8812204e540a557a90e1dcd5 Mon Sep 17 00:00:00 2001 From: Ibrahn Sahir Date: Fri, 13 Jul 2018 14:00:10 +0100 Subject: [PATCH] fixed a branch on uninitialised data in gui/tree I don't think it was really causing any harm, but this makes things a little more explicit and helps clean up valgrind output. --- scene/gui/tree.cpp | 19 ++++++++++++++----- 1 file changed, 14 insertions(+), 5 deletions(-) diff --git a/scene/gui/tree.cpp b/scene/gui/tree.cpp index 1d276127667..6ab1bf3d581 100644 --- a/scene/gui/tree.cpp +++ b/scene/gui/tree.cpp @@ -2426,14 +2426,23 @@ void Tree::_gui_input(Ref p_event) { int col, h, section; TreeItem *it = _find_item_at_pos(root, mpos, col, h, section); - if ((drop_mode_flags && it != drop_mode_over) || section != drop_mode_section) { - drop_mode_over = it; - drop_mode_section = section; + if (drop_mode_flags) { + if (it != drop_mode_over) { + drop_mode_over = it; + update(); + } + if (it && section != drop_mode_section) { + drop_mode_section = section; + update(); + } + } + + if (it != cache.hover_item) { + cache.hover_item = it; update(); } - if (it != cache.hover_item || col != cache.hover_cell) { - cache.hover_item = it; + if (it && col != cache.hover_cell) { cache.hover_cell = col; update(); }