From 0053a7ad7709327e5cce0cb0a3ead5e100c2c08e Mon Sep 17 00:00:00 2001
From: Jakub Trllo <jakub.trllo@gmail.com>
Date: Wed, 24 Aug 2022 10:38:55 +0200
Subject: [PATCH] fix last saved object access

---
 openpype/settings/handlers.py | 22 ++++++++++++++++++----
 1 file changed, 18 insertions(+), 4 deletions(-)

diff --git a/openpype/settings/handlers.py b/openpype/settings/handlers.py
index 79ec6248ac..def8c16ea7 100644
--- a/openpype/settings/handlers.py
+++ b/openpype/settings/handlers.py
@@ -831,7 +831,10 @@ class MongoSettingsHandler(SettingsHandler):
         data_cache.update_last_saved_info(last_saved_info)
 
         self._save_project_data(
-            project_name, self._project_settings_key, data_cache
+            project_name,
+            self._project_settings_key,
+            data_cache,
+            last_saved_info
         )
 
     def save_project_anatomy(self, project_name, anatomy_data):
@@ -849,8 +852,16 @@ class MongoSettingsHandler(SettingsHandler):
             self._save_project_anatomy_data(project_name, data_cache)
 
         else:
+            last_saved_info = SettingsStateInfo.create_new(
+                self._current_version,
+                PROJECT_ANATOMY_KEY,
+                project_name
+            )
             self._save_project_data(
-                project_name, self._project_anatomy_key, data_cache
+                project_name,
+                self._project_anatomy_key,
+                data_cache,
+                last_saved_info
             )
 
     @classmethod
@@ -931,14 +942,16 @@ class MongoSettingsHandler(SettingsHandler):
             {"$set": update_dict}
         )
 
-    def _save_project_data(self, project_name, doc_type, data_cache):
+    def _save_project_data(
+        self, project_name, doc_type, data_cache, last_saved_info
+    ):
         is_default = bool(project_name is None)
         query_filter = {
             "type": doc_type,
             "is_default": is_default,
             "version": self._current_version
         }
-        last_saved_info = data_cache.last_saved_info
+
         new_project_settings_doc = {
             "type": doc_type,
             "data": data_cache.data,
@@ -946,6 +959,7 @@ class MongoSettingsHandler(SettingsHandler):
             "version": self._current_version,
             "last_saved_info": last_saved_info.to_data()
         }
+
         if not is_default:
             query_filter["project_name"] = project_name
             new_project_settings_doc["project_name"] = project_name