summaryrefslogtreecommitdiff
path: root/scene/gui/scroll_container.cpp
diff options
context:
space:
mode:
authorRĂ©mi Verschelde <remi@verschelde.fr>2021-04-05 11:54:08 +0200
committerGitHub <noreply@github.com>2021-04-05 11:54:08 +0200
commit77dc4c3cb6b59e826699c1590bc26b071e868216 (patch)
tree5ba2509b65b1a9e48d916616e08c593688ee5a14 /scene/gui/scroll_container.cpp
parent789646e2010632908b0569c64190b1b37e033cb8 (diff)
parent504bc5cc6719db3bcafa5f1262b95fa2a58ec0a1 (diff)
Merge pull request #47636 from qarmin/input
Fix crashes in *_input functions
Diffstat (limited to 'scene/gui/scroll_container.cpp')
-rw-r--r--scene/gui/scroll_container.cpp2
1 files changed, 2 insertions, 0 deletions
diff --git a/scene/gui/scroll_container.cpp b/scene/gui/scroll_container.cpp
index 90a528482f..757a0841ea 100644
--- a/scene/gui/scroll_container.cpp
+++ b/scene/gui/scroll_container.cpp
@@ -88,6 +88,8 @@ void ScrollContainer::_cancel_drag() {
}
void ScrollContainer::_gui_input(const Ref<InputEvent> &p_gui_input) {
+ ERR_FAIL_COND(p_gui_input.is_null());
+
double prev_v_scroll = v_scroll->get_value();
double prev_h_scroll = h_scroll->get_value();