Merge pull request #7406 from neikeq/pr-issue-5076

TileMap: _update_dirty_quadrants() cancel pending update pre return

1 files changed, 3 insertions, 3 deletions

diff --git a/scene/2d/tile_map.cpp b/scene/2d/tile_map.cpp
index fd3d409f29..ed16212f3e 100644
--- a/scene/2d/tile_map.cpp
+++ b/scene/2d/tile_map.cpp
@@ -268,10 +268,10 @@ void TileMap::_update_dirty_quadrants() {
 
 	if (!pending_update)
 		return;
-	if (!is_inside_tree())
-		return;
-	if (!tile_set.is_valid())
+	if (!is_inside_tree() || !tile_set.is_valid()) {
+		pending_update = false;
 		return;
+	}
 
 	VisualServer *vs = VisualServer::get_singleton();
 	Physics2DServer *ps = Physics2DServer::get_singleton();