-Make sure scenes properly update when switching tabs, even if sub-instances changed. Fixes #3201

2 files changed, 5 insertions, 2 deletions

diff --git a/core/io/resource_format_binary.cpp b/core/io/resource_format_binary.cpp
index 796dcde3d0..c008c3f9a4 100644
--- a/core/io/resource_format_binary.cpp
+++ b/core/io/resource_format_binary.cpp
@@ -725,7 +725,8 @@ Error ResourceInteractiveLoaderBinary::poll(){
 		}
 	} else {
 
-		path=res_path;
+		if (!ResourceCache::has(res_path))
+			path=res_path;
 	}
 
 	uint64_t offset = internal_resources[s].offset;
diff --git a/core/io/resource_format_xml.cpp b/core/io/resource_format_xml.cpp
index 74813d24fa..8c8d79948a 100644
--- a/core/io/resource_format_xml.cpp
+++ b/core/io/resource_format_xml.cpp
@@ -1570,7 +1570,9 @@ Error ResourceInteractiveLoaderXML::poll() {
 	if (main) {
 		f->close();
 		resource=res;
-		resource->set_path(res_path);
+		if (!ResourceCache::has(res_path)) {
+			resource->set_path(res_path);
+		}
 		error=ERR_FILE_EOF;
 		return error;