aboutsummaryrefslogtreecommitdiff
path: root/scene/2d/area_2d.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'scene/2d/area_2d.cpp')
-rw-r--r--scene/2d/area_2d.cpp11
1 files changed, 8 insertions, 3 deletions
diff --git a/scene/2d/area_2d.cpp b/scene/2d/area_2d.cpp
index fff399f8f..1a53f684e 100644
--- a/scene/2d/area_2d.cpp
+++ b/scene/2d/area_2d.cpp
@@ -380,6 +380,10 @@ void Area2D::_notification(int p_what) {
switch (p_what) {
+ case NOTIFICATION_READY: {
+
+ is_ready = true;
+ } break;
case NOTIFICATION_EXIT_TREE: {
monitoring_stored = monitoring;
@@ -387,8 +391,8 @@ void Area2D::_notification(int p_what) {
_clear_monitoring();
} break;
case NOTIFICATION_ENTER_TREE: {
-
- set_enable_monitoring(monitoring_stored);
+ if (is_ready)
+ set_enable_monitoring(monitoring_stored);
} break;
}
}
@@ -646,7 +650,8 @@ Area2D::Area2D()
monitorable = false;
collision_mask = 1;
layer_mask = 1;
- monitoring_stored = true;
+ monitoring_stored = false;
+ is_ready = false;
set_enable_monitoring(true);
set_monitorable(true);
}