diff options
| author | Rémi Verschelde <remi@verschelde.fr> | 2021-04-05 11:54:08 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-04-05 11:54:08 +0200 |
| commit | 77dc4c3cb6b59e826699c1590bc26b071e868216 (patch) | |
| tree | 5ba2509b65b1a9e48d916616e08c593688ee5a14 /scene/gui/base_button.cpp | |
| parent | 789646e2010632908b0569c64190b1b37e033cb8 (diff) | |
| parent | 504bc5cc6719db3bcafa5f1262b95fa2a58ec0a1 (diff) | |
Merge pull request #47636 from qarmin/input
Fix crashes in *_input functions
Diffstat (limited to 'scene/gui/base_button.cpp')
| -rw-r--r-- | scene/gui/base_button.cpp | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/scene/gui/base_button.cpp b/scene/gui/base_button.cpp index db13b9b11f..826fd0189b 100644 --- a/scene/gui/base_button.cpp +++ b/scene/gui/base_button.cpp @@ -53,6 +53,8 @@ void BaseButton::_unpress_group() { } void BaseButton::_gui_input(Ref<InputEvent> p_event) { + ERR_FAIL_COND(p_event.is_null()); + if (status.disabled) { // no interaction with disabled button return; } @@ -323,6 +325,8 @@ Ref<Shortcut> BaseButton::get_shortcut() const { } void BaseButton::_unhandled_key_input(Ref<InputEvent> p_event) { + ERR_FAIL_COND(p_event.is_null()); + if (!_is_focus_owner_in_shorcut_context()) { return; } |