From a5c3e3084a33159418a7c709da8937161a209340 Mon Sep 17 00:00:00 2001
From: Juan Linietsky
Date: Wed, 15 Nov 2017 10:41:31 -0300
Subject: When script changes, defer tree updating. Fixes #9704

---
 modules/gdscript/gd_script.cpp | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

(limited to 'modules/gdscript/gd_script.cpp')

diff --git a/modules/gdscript/gd_script.cpp b/modules/gdscript/gd_script.cpp
index ba0353ae4..e5d834c9e 100644
--- a/modules/gdscript/gd_script.cpp
+++ b/modules/gdscript/gd_script.cpp
@@ -1599,17 +1599,18 @@ void GDScriptLanguage::reload_tool_script(const Ref<Script> &p_script, bool p_so
 				Object *obj = E->get()->placeholders.front()->get()->get_owner();
 
 				//save instance info
-				List<Pair<StringName, Variant> > state;
 				if (obj->get_script_instance()) {
 
+					map.insert(obj->get_instance_id(), List<Pair<StringName, Variant> >());
+					List<Pair<StringName, Variant> > &state = map[obj->get_instance_id()];
 					obj->get_script_instance()->get_property_state(state);
-					map[obj->get_instance_id()] = state;
 					obj->set_script(RefPtr());
 				} else {
 					// no instance found. Let's remove it so we don't loop forever
 					E->get()->placeholders.erase(E->get()->placeholders.front()->get());
 				}
 			}
+
 #endif
 
 			for (Map<ObjectID, List<Pair<StringName, Variant> > >::Element *F = E->get()->pending_reload_state.front(); F; F = F->next()) {
-- 
cgit v1.2.3-70-g09d2