summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJuan Linietsky <reduzio@gmail.com>2017-08-20 23:59:44 -0300
committerGitHub <noreply@github.com>2017-08-20 23:59:44 -0300
commitd8cd849a431db4b5a5d8d61161062ca7cf101220 (patch)
tree19810b473d961742c33ceb411984b76b1fc912c3
parent533014b88c964044441dc04dce6e757b0776de97 (diff)
parent0017e21521f6f0feecabc4bae2c72a66c780583b (diff)
Merge pull request #10492 from Rubonnek/fix-segfault-on-arch-linux
Fixed segfault when hovering over tree elements and showing tooltips.
-rw-r--r--scene/main/viewport.cpp4
1 files changed, 4 insertions, 0 deletions
diff --git a/scene/main/viewport.cpp b/scene/main/viewport.cpp
index 7148cda5c4..e19e069282 100644
--- a/scene/main/viewport.cpp
+++ b/scene/main/viewport.cpp
@@ -1456,6 +1456,10 @@ void Viewport::_gui_show_tooltip() {
gui.tooltip_popup = NULL;
}
+ if (!gui.tooltip) {
+ return;
+ }
+
Control *rp = gui.tooltip->get_root_parent_control();
if (!rp)
return;