From e151b66127ec9999b8fdef784aca79560082b9f9 Mon Sep 17 00:00:00 2001
From: Karroffel
Date: Mon, 24 Apr 2017 18:51:39 +0200
Subject: fixed a bug where saving a GDScript file crashed the editor

I changed the loop in #8502, turns out it fixed the error I was facing but introduced a new one. This fixes both

(cherry picked from commit 67886bab1eb0599ec724192a4298c980e6107f2a)
---
 modules/gdscript/gd_script.cpp | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

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

diff --git a/modules/gdscript/gd_script.cpp b/modules/gdscript/gd_script.cpp
index 072948b95..3b3d3f1db 100644
--- a/modules/gdscript/gd_script.cpp
+++ b/modules/gdscript/gd_script.cpp
@@ -1533,8 +1533,8 @@ void GDScriptLanguage::reload_tool_script(const Ref<Script> &p_script, bool p_so
 #ifdef TOOLS_ENABLED
 
 			while (E->get()->placeholders.size()) {
-
 				Object *obj = E->get()->placeholders.front()->get()->get_owner();
+
 				//save instance info
 				List<Pair<StringName, Variant> > state;
 				if (obj->get_script_instance()) {
@@ -1542,6 +1542,9 @@ void GDScriptLanguage::reload_tool_script(const Ref<Script> &p_script, bool p_so
 					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
-- 
cgit v1.2.3-70-g09d2