diff options
| author | Haoyu Qiu <timothyqiu32@gmail.com> | 2021-06-13 11:36:32 +0800 |
|---|---|---|
| committer | Haoyu Qiu <timothyqiu32@gmail.com> | 2021-06-13 12:51:26 +0800 |
| commit | 80927b7a81c4f2ea962ffd81a962437d05063403 (patch) | |
| tree | c918d6f5a188c0285007eb201b3872329abf916e | |
| parent | ccaefbce551fe6c1a0016b2f0407b6323ab8c601 (diff) | |
Fix Viewport crashes when not in tree
| -rw-r--r-- | scene/main/viewport.cpp | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/scene/main/viewport.cpp b/scene/main/viewport.cpp index 17c0023b09..5369792194 100644 --- a/scene/main/viewport.cpp +++ b/scene/main/viewport.cpp @@ -2547,6 +2547,8 @@ void Viewport::_gui_remove_control(Control *p_control) { } Window *Viewport::get_base_window() const { + ERR_FAIL_COND_V(!is_inside_tree(), nullptr); + Viewport *v = const_cast<Viewport *>(this); Window *w = Object::cast_to<Window>(v); while (!w) { @@ -3336,6 +3338,7 @@ bool Viewport::is_input_handled() const { return local_input_handled; } else { const Viewport *vp = this; + ERR_FAIL_COND_V(!is_inside_tree(), false); while (true) { if (Object::cast_to<Window>(vp)) { break; |