From 5b3acd287dcc08e6a05f7526f3bd28c5a00d8075 Mon Sep 17 00:00:00 2001
From: Ignacio Etcheverry <ignalfonsore@gmail.com>
Date: Sun, 1 Jan 2017 18:31:29 +0100
Subject: [PATCH] TileMap: _update_dirty_quadrants() cancel pending update pre
 return

---
 scene/2d/tile_map.cpp | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/scene/2d/tile_map.cpp b/scene/2d/tile_map.cpp
index cc904e4d047..776d973beeb 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();