From cacced7e507f7603bacc03ae2616e58f0ede122a Mon Sep 17 00:00:00 2001 From: Hein-Pieter van Braam Date: Thu, 24 Aug 2017 22:58:51 +0200 Subject: Convert Object::cast_to() to the static version Currently we rely on some undefined behavior when Object->cast_to() gets called with a Null pointer. This used to work fine with GCC < 6 but newer versions of GCC remove all codepaths in which the this pointer is Null. However, the non-static cast_to() was supposed to be null safe. This patch makes cast_to() Null safe and removes the now redundant Null checks where they existed. It is explained in this article: https://www.viva64.com/en/b/0226/ --- scene/gui/menu_button.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'scene/gui/menu_button.cpp') diff --git a/scene/gui/menu_button.cpp b/scene/gui/menu_button.cpp index 93284f2b6..99e78d885 100644 --- a/scene/gui/menu_button.cpp +++ b/scene/gui/menu_button.cpp @@ -33,7 +33,7 @@ void MenuButton::_unhandled_key_input(Ref p_event) { - if (p_event->is_pressed() && !p_event->is_echo() && (p_event->cast_to() || p_event->cast_to() || p_event->cast_to())) { + if (p_event->is_pressed() && !p_event->is_echo() && (Object::cast_to(p_event.ptr()) || Object::cast_to(p_event.ptr()) || Object::cast_to(*p_event))) { if (!get_parent() || !is_visible_in_tree() || is_disabled()) return; -- cgit v1.2.3-70-g09d2