From de72f26f9451f48608229cc85868c1545a201afd Mon Sep 17 00:00:00 2001
From: Jakub Jezek <jakubjezek001@gmail.com>
Date: Tue, 30 May 2023 17:09:54 +0200
Subject: [PATCH 1/2] adding check also against class attribute

---
 openpype/plugins/publish/collect_frames_fix.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/openpype/plugins/publish/collect_frames_fix.py b/openpype/plugins/publish/collect_frames_fix.py
index 837738eb06..ca1ccc19fd 100644
--- a/openpype/plugins/publish/collect_frames_fix.py
+++ b/openpype/plugins/publish/collect_frames_fix.py
@@ -66,7 +66,7 @@ class CollectFramesFixDef(
             self.log.debug("last_version_published_files::{}".format(
                 instance.data["last_version_published_files"]))
 
-            if rewrite_version:
+            if self.rewrite_version_enable and rewrite_version:
                 instance.data["version"] = version["name"]
                 # limits triggering version validator
                 instance.data.pop("latestVersion")

From 4d76c2520f254991da405dc463418d9bb6e2cfc4 Mon Sep 17 00:00:00 2001
From: Jakub Jezek <jakubjezek001@gmail.com>
Date: Tue, 30 May 2023 17:19:00 +0200
Subject: [PATCH 2/2] cleanup

---
 .../plugins/publish/collect_frames_fix.py     | 62 ++++++++++---------
 1 file changed, 34 insertions(+), 28 deletions(-)

diff --git a/openpype/plugins/publish/collect_frames_fix.py b/openpype/plugins/publish/collect_frames_fix.py
index ca1ccc19fd..86e727b053 100644
--- a/openpype/plugins/publish/collect_frames_fix.py
+++ b/openpype/plugins/publish/collect_frames_fix.py
@@ -35,41 +35,47 @@ class CollectFramesFixDef(
 
         rewrite_version = attribute_values.get("rewrite_version")
 
-        if frames_to_fix:
-            instance.data["frames_to_fix"] = frames_to_fix
+        if not frames_to_fix:
+            return
 
-            subset_name = instance.data["subset"]
-            asset_name = instance.data["asset"]
+        instance.data["frames_to_fix"] = frames_to_fix
 
-            project_entity = instance.data["projectEntity"]
-            project_name = project_entity["name"]
+        subset_name = instance.data["subset"]
+        asset_name = instance.data["asset"]
 
-            version = get_last_version_by_subset_name(project_name,
-                                                      subset_name,
-                                                      asset_name=asset_name)
-            if not version:
-                self.log.warning("No last version found, "
-                                 "re-render not possible")
-                return
+        project_entity = instance.data["projectEntity"]
+        project_name = project_entity["name"]
 
-            representations = get_representations(project_name,
-                                                  version_ids=[version["_id"]])
-            published_files = []
-            for repre in representations:
-                if repre["context"]["family"] not in self.families:
-                    continue
+        version = get_last_version_by_subset_name(
+            project_name,
+            subset_name,
+            asset_name=asset_name
+        )
+        if not version:
+            self.log.warning(
+                "No last version found, re-render not possible"
+            )
+            return
 
-                for file_info in repre.get("files"):
-                    published_files.append(file_info["path"])
+        representations = get_representations(
+            project_name, version_ids=[version["_id"]]
+        )
+        published_files = []
+        for repre in representations:
+            if repre["context"]["family"] not in self.families:
+                continue
 
-            instance.data["last_version_published_files"] = published_files
-            self.log.debug("last_version_published_files::{}".format(
-                instance.data["last_version_published_files"]))
+            for file_info in repre.get("files"):
+                published_files.append(file_info["path"])
 
-            if self.rewrite_version_enable and rewrite_version:
-                instance.data["version"] = version["name"]
-                # limits triggering version validator
-                instance.data.pop("latestVersion")
+        instance.data["last_version_published_files"] = published_files
+        self.log.debug("last_version_published_files::{}".format(
+            instance.data["last_version_published_files"]))
+
+        if self.rewrite_version_enable and rewrite_version:
+            instance.data["version"] = version["name"]
+            # limits triggering version validator
+            instance.data.pop("latestVersion")
 
     @classmethod
     def get_attribute_defs(cls):