diff options
| author | Juan Linietsky <juan@godotengine.org> | 2019-02-22 09:04:59 -0300 |
|---|---|---|
| committer | Juan Linietsky <juan@godotengine.org> | 2019-02-22 09:05:34 -0300 |
| commit | edbf1d0ea49517be80e514595fc71d7069423edb (patch) | |
| tree | c710d9b58bbaf69dffd80abbe0cf7012c2bd0c34 /scene/2d/area_2d.cpp | |
| parent | 258bc0385762b5d1dceff520e0c4e1c4e4e512a0 (diff) | |
| download | redot-engine-edbf1d0ea49517be80e514595fc71d7069423edb.tar.gz | |
Check that area is inside tree besides checking that queries are flushed, fixes #26148
Diffstat (limited to 'scene/2d/area_2d.cpp')
| -rw-r--r-- | scene/2d/area_2d.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/scene/2d/area_2d.cpp b/scene/2d/area_2d.cpp index 63c4758a34..9e8bf62fc5 100644 --- a/scene/2d/area_2d.cpp +++ b/scene/2d/area_2d.cpp @@ -426,7 +426,7 @@ bool Area2D::is_monitoring() const { void Area2D::set_monitorable(bool p_enable) { - if (locked || Physics2DServer::get_singleton()->is_flushing_queries()) { + if (locked || (is_inside_tree() && Physics2DServer::get_singleton()->is_flushing_queries())) { ERR_EXPLAIN("Function blocked during in/out signal. Use set_deferred(\"monitorable\",true/false)"); } ERR_FAIL_COND(locked || Physics2DServer::get_singleton()->is_flushing_queries()); |