Fix Ignore External Changes Bug

Fix Issue #106410 : Add a check for external modified scene files (_is_scene_externally_modified()) before handling the logic of ignoring external changes.

Author: jorgekorgut

editor/editor_node.cpp

@@ -1298,24 +1298,27 @@ void EditorNode::_remove_lock_file() {
 	OS::get_singleton()->remove_lock_file();
 }
 
+bool EditorNode::_is_scene_externally_modified(int scene_index) {
+	Ref<DirAccess> dir_access = DirAccess::create(DirAccess::ACCESS_RESOURCES);
+	if (editor_data.get_scene_path(scene_index) == "" || !dir_access->file_exists(editor_data.get_scene_path(scene_index))) {
+		return false;
+	}
+
+	uint64_t last_date = editor_data.get_scene_modified_time(scene_index);
+	uint64_t date = FileAccess::get_modified_time(editor_data.get_scene_path(scene_index));
+
+	return date > last_date;
+}
+
 void EditorNode::_scan_external_changes() {
 	disk_changed_list->clear();
 	TreeItem *r = disk_changed_list->create_item();
 	disk_changed_list->set_hide_root(true);
 	bool need_reload = false;
 
 	// Check if any edited scene has changed.
-
 	for (int i = 0; i < editor_data.get_edited_scene_count(); i++) {
-		Ref<DirAccess> da = DirAccess::create(DirAccess::ACCESS_RESOURCES);
-		if (editor_data.get_scene_path(i) == "" || !da->file_exists(editor_data.get_scene_path(i))) {
-			continue;
-		}
-
-		uint64_t last_date = editor_data.get_scene_modified_time(i);
-		uint64_t date = FileAccess::get_modified_time(editor_data.get_scene_path(i));
-
-		if (date > last_date) {
+		if (_is_scene_externally_modified(i)) {
 			TreeItem *ti = disk_changed_list->create_item(r);
 			ti->set_text(0, editor_data.get_scene_path(i).get_file());
 			need_reload = true;
@@ -2152,7 +2155,7 @@ void EditorNode::restart_editor(bool p_goto_project_manager) {
 void EditorNode::_save_all_scenes() {
 	scenes_to_save_as.clear(); // In case saving was canceled before.
 	for (int i = 0; i < editor_data.get_edited_scene_count(); i++) {
-		if (!_is_scene_unsaved(i)) {
+		if (!_is_scene_unsaved(i) && !_is_scene_externally_modified(i)) {
 			continue;
 		}
 

editor/editor_node.h

@@ -671,6 +671,7 @@ class EditorNode : public Node {
 	void _update_update_spinner();
 
 	void _resources_changed(const Vector<String> &p_resources);
+	bool _is_scene_externally_modified(int scene_index);
 	void _scan_external_changes();
 	void _reload_modified_scenes();
 	void _reload_project_settings();