From 048c252602aa9e21175b7e125dbcae204e303b1f Mon Sep 17 00:00:00 2001
From: Yuri Sizov <yuris@humnom.net>
Date: Wed, 8 Mar 2023 19:46:55 +0100
Subject: Prevent cache corruption when saving resources in the editor

(cherry picked from commit 496bd94c21dbda01fc7d9d0a108eecef21924024)
---
 editor/editor_node.h | 1 +
 1 file changed, 1 insertion(+)

(limited to 'editor/editor_node.h')

diff --git a/editor/editor_node.h b/editor/editor_node.h
index 8ad5969249..6a9d052791 100644
--- a/editor/editor_node.h
+++ b/editor/editor_node.h
@@ -485,6 +485,7 @@ private:
 	Object *current = nullptr;
 
 	Ref<Resource> saving_resource;
+	HashSet<Ref<Resource>> saving_resources_in_path;
 
 	uint64_t update_spinner_step_msec = 0;
 	uint64_t update_spinner_step_frame = 0;
-- 
cgit v1.2.3


From 764fe8ac519bc37b3f17926fa02c25609de528ed Mon Sep 17 00:00:00 2001
From: bruvzg <7645683+bruvzg@users.noreply.github.com>
Date: Wed, 15 Feb 2023 16:35:16 +0200
Subject: Automatically reparent editor message dialogs to avoid error spam.

(cherry picked from commit 921f3b7589084e07a4b6eefd89ec7fe81857a8b7)
---
 editor/editor_node.h | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

(limited to 'editor/editor_node.h')

diff --git a/editor/editor_node.h b/editor/editor_node.h
index 6a9d052791..66a3bf5be2 100644
--- a/editor/editor_node.h
+++ b/editor/editor_node.h
@@ -45,6 +45,7 @@ typedef void (*EditorPluginInitializeCallback)();
 typedef bool (*EditorBuildCallback)();
 
 class AcceptDialog;
+class AcceptDialogAutoReparent;
 class AudioStreamPreviewGenerator;
 class BackgroundProgress;
 class CenterContainer;
@@ -370,10 +371,10 @@ private:
 	PluginConfigDialog *plugin_config_dialog = nullptr;
 
 	RichTextLabel *load_errors = nullptr;
-	AcceptDialog *load_error_dialog = nullptr;
+	AcceptDialogAutoReparent *load_error_dialog = nullptr;
 
 	RichTextLabel *execute_outputs = nullptr;
-	AcceptDialog *execute_output_dialog = nullptr;
+	AcceptDialogAutoReparent *execute_output_dialog = nullptr;
 
 	Ref<Theme> theme;
 
@@ -388,10 +389,10 @@ private:
 	ConfirmationDialog *import_confirmation = nullptr;
 	ConfirmationDialog *pick_main_scene = nullptr;
 	Button *select_current_scene_button = nullptr;
-	AcceptDialog *accept = nullptr;
-	AcceptDialog *save_accept = nullptr;
+	AcceptDialogAutoReparent *accept = nullptr;
+	AcceptDialogAutoReparent *save_accept = nullptr;
 	EditorAbout *about = nullptr;
-	AcceptDialog *warning = nullptr;
+	AcceptDialogAutoReparent *warning = nullptr;
 
 	int overridden_default_layout = -1;
 	Ref<ConfigFile> default_layout;
-- 
cgit v1.2.3