浏览代码

Merge pull request #62323 from Maran23/window-title-changed-data-fix

Rémi Verschelde 3 年之前
父节点
当前提交
c32285733d
共有 1 个文件被更改,包括 9 次插入3 次删除
  1. 9 3
      editor/editor_node.cpp

+ 9 - 3
editor/editor_node.cpp

@@ -553,8 +553,6 @@ void EditorNode::_update_from_settings() {
 	tree->set_debug_collision_contact_color(GLOBAL_GET("debug/shapes/collision/contact_color"));
 	tree->set_debug_collision_contact_color(GLOBAL_GET("debug/shapes/collision/contact_color"));
 	tree->set_debug_navigation_color(GLOBAL_GET("debug/shapes/navigation/geometry_color"));
 	tree->set_debug_navigation_color(GLOBAL_GET("debug/shapes/navigation/geometry_color"));
 	tree->set_debug_navigation_disabled_color(GLOBAL_GET("debug/shapes/navigation/disabled_geometry_color"));
 	tree->set_debug_navigation_disabled_color(GLOBAL_GET("debug/shapes/navigation/disabled_geometry_color"));
-
-	_update_title();
 }
 }
 
 
 void EditorNode::_select_default_main_screen_plugin() {
 void EditorNode::_select_default_main_screen_plugin() {
@@ -584,7 +582,11 @@ void EditorNode::_notification(int p_what) {
 				opening_prev = false;
 				opening_prev = false;
 			}
 			}
 
 
-			unsaved_cache = saved_version != editor_data.get_undo_redo().get_version();
+			bool unsaved_cache_changed = false;
+			if (unsaved_cache != (saved_version != editor_data.get_undo_redo().get_version())) {
+				unsaved_cache = (saved_version != editor_data.get_undo_redo().get_version());
+				unsaved_cache_changed = true;
+			}
 
 
 			if (last_checked_version != editor_data.get_undo_redo().get_version()) {
 			if (last_checked_version != editor_data.get_undo_redo().get_version()) {
 				_update_scene_tabs();
 				_update_scene_tabs();
@@ -614,6 +616,10 @@ void EditorNode::_notification(int p_what) {
 
 
 			ResourceImporterTexture::get_singleton()->update_imports();
 			ResourceImporterTexture::get_singleton()->update_imports();
 
 
+			if (settings_changed || unsaved_cache_changed) {
+				_update_title();
+			}
+
 			if (settings_changed) {
 			if (settings_changed) {
 				_update_from_settings();
 				_update_from_settings();
 				settings_changed = false;
 				settings_changed = false;