From df4f3d45aa6c48ee209845b2a35a773b189455e0 Mon Sep 17 00:00:00 2001
From: Jakub Trllo <jakub.trllo@gmail.com>
Date: Wed, 12 Oct 2022 14:44:54 +0200
Subject: [PATCH] fix instances access in 'get_subset_name'

---
 openpype/tools/publisher/control.py         | 5 ++++-
 openpype/tools/publisher/widgets/widgets.py | 2 +-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/openpype/tools/publisher/control.py b/openpype/tools/publisher/control.py
index 05b0bb39be..699b8843cc 100644
--- a/openpype/tools/publisher/control.py
+++ b/openpype/tools/publisher/control.py
@@ -1820,9 +1820,12 @@ class PublisherController(BasePublisherController):
         creator = self._creators[creator_identifier]
         project_name = self.project_name
         asset_doc = self._asset_docs_cache.get_full_asset_by_name(asset_name)
+        instance = None
+        if instance_id:
+            instance = self.instances[instance_id]
 
         return creator.get_subset_name(
-            variant, task_name, asset_doc, project_name
+            variant, task_name, asset_doc, project_name, instance=instance
         )
 
     def create(
diff --git a/openpype/tools/publisher/widgets/widgets.py b/openpype/tools/publisher/widgets/widgets.py
index edd9d55c75..536650e209 100644
--- a/openpype/tools/publisher/widgets/widgets.py
+++ b/openpype/tools/publisher/widgets/widgets.py
@@ -1082,8 +1082,8 @@ class GlobalAttrsWidget(QtWidgets.QWidget):
                     new_task_name,
                     new_asset_name,
                     instance.id,
-                    instance=instance
                 )
+
             except TaskNotSetError:
                 invalid_tasks = True
                 instance.set_task_invalid(True)