1 files changed, 15 insertions, 22 deletions

diff --git a/editor/script_editor_debugger.cpp b/editor/script_editor_debugger.cpp
index f13d3f5287..eb72d0aa6e 100644
--- a/editor/script_editor_debugger.cpp
+++ b/editor/script_editor_debugger.cpp
@@ -502,8 +502,12 @@ void ScriptEditorDebugger::_parse_message(const String &p_msg, const Array &p_da
 				String str = var;
 				var = str.substr(4, str.length());
 
-				if (str.begins_with("PATH"))
-					var = ResourceLoader::load(var);
+				if (str.begins_with("PATH")) {
+					if (String(var).empty())
+						var = RES();
+					else
+						var = ResourceLoader::load(var);
+				}
 			}
 
 			debugObj->prop_values[pinfo.name] = var;
@@ -577,12 +581,9 @@ void ScriptEditorDebugger::_parse_message(const String &p_msg, const Array &p_da
 			String hs = String();
 
 			if (v.get_type() == Variant::OBJECT) {
+				v = Object::cast_to<EncodedObjectAsID>(v)->get_object_id();
 				h = PROPERTY_HINT_OBJECT_ID;
-				v = ObjectDB::get_instance(Object::cast_to<EncodedObjectAsID>(v)->get_object_id());
-				String s = v;
-				s = s.replace("[", "");
-				hs = s.get_slice(":", 0);
-				v = s.get_slice(":", 1).to_int();
+				hs = "Object";
 			}
 
 			variables->add_property("Locals/" + n, v, h, hs);
@@ -599,12 +600,9 @@ void ScriptEditorDebugger::_parse_message(const String &p_msg, const Array &p_da
 			String hs = String();
 
 			if (v.get_type() == Variant::OBJECT) {
+				v = Object::cast_to<EncodedObjectAsID>(v)->get_object_id();
 				h = PROPERTY_HINT_OBJECT_ID;
-				v = ObjectDB::get_instance(Object::cast_to<EncodedObjectAsID>(v)->get_object_id());
-				String s = v;
-				s = s.replace("[", "");
-				hs = s.get_slice(":", 0);
-				v = s.get_slice(":", 1).to_int();
+				hs = "Object";
 			}
 
 			variables->add_property("Members/" + n, v, h, hs);
@@ -621,12 +619,9 @@ void ScriptEditorDebugger::_parse_message(const String &p_msg, const Array &p_da
 			String hs = String();
 
 			if (v.get_type() == Variant::OBJECT) {
+				v = Object::cast_to<EncodedObjectAsID>(v)->get_object_id();
 				h = PROPERTY_HINT_OBJECT_ID;
-				v = ObjectDB::get_instance(Object::cast_to<EncodedObjectAsID>(v)->get_object_id());
-				String s = v;
-				s = s.replace("[", "");
-				hs = s.get_slice(":", 0);
-				v = s.get_slice(":", 1).to_int();
+				hs = "Object";
 			}
 
 			variables->add_property("Globals/" + n, v, h, hs);
@@ -731,9 +726,10 @@ void ScriptEditorDebugger::_parse_message(const String &p_msg, const Array &p_da
 		String source(err[5]);
 		bool source_is_project_file = source.begins_with("res://");
 		if (source_is_project_file)
-			source = source.get_file();
+			txt = source.get_file() + ":" + String(err[6]);
+		else
+			txt = source + ":" + String(err[6]);
 
-		txt = source + ":" + String(err[6]);
 		String method = err[4];
 		if (method.length() > 0)
 			txt += " @ " + method + "()";
@@ -1298,9 +1294,6 @@ void ScriptEditorDebugger::stop() {
 	EditorNode::get_singleton()->get_scene_tree_dock()->hide_remote_tree();
 	EditorNode::get_singleton()->get_scene_tree_dock()->hide_tab_buttons();
 
-	Node *node = editor->get_scene_tree_dock()->get_tree_editor()->get_selected();
-	editor->push_item(node);
-
 	if (hide_on_stop) {
 		if (is_visible_in_tree())
 			EditorNode::get_singleton()->hide_bottom_panel();