From 42f575fca94722a25ae462a5112a843799d9aad1 Mon Sep 17 00:00:00 2001
From: Jakub Trllo <jakub.trllo@gmail.com>
Date: Fri, 9 Sep 2022 14:23:36 +0200
Subject: [PATCH 1/2] actions are expected as list so each application in group
 is stored if force not open workfile is enabled

---
 openpype/tools/launcher/models.py | 46 +++++++++++++++++++------------
 1 file changed, 28 insertions(+), 18 deletions(-)

diff --git a/openpype/tools/launcher/models.py b/openpype/tools/launcher/models.py
index 6d40d21f96..6e3b531018 100644
--- a/openpype/tools/launcher/models.py
+++ b/openpype/tools/launcher/models.py
@@ -281,18 +281,25 @@ class ActionModel(QtGui.QStandardItemModel):
         if not action_item:
             return
 
-        action = action_item.data(ACTION_ROLE)
-        actual_data = self._prepare_compare_data(action)
+        actions = action_item.data(ACTION_ROLE)
+        if not isinstance(actions, list):
+            actions = [actions]
+
+        action_actions_data = [
+            self._prepare_compare_data(action)
+            for action in actions
+        ]
 
         stored = self.launcher_registry.get_item("force_not_open_workfile")
-        if is_checked:
-            stored.append(actual_data)
-        else:
-            final_values = []
-            for config in stored:
-                if config != actual_data:
-                    final_values.append(config)
-            stored = final_values
+        for actual_data in action_actions_data:
+            if is_checked:
+                stored.append(actual_data)
+            else:
+                final_values = []
+                for config in stored:
+                    if config != actual_data:
+                        final_values.append(config)
+                stored = final_values
 
         self.launcher_registry.set_item("force_not_open_workfile", stored)
         self.launcher_registry._get_item.cache_clear()
@@ -329,21 +336,24 @@ class ActionModel(QtGui.QStandardItemModel):
             item (QStandardItem)
             stored (list) of dict
         """
-        action = item.data(ACTION_ROLE)
-        if not self.is_application_action(action):
+
+        actions = item.data(ACTION_ROLE)
+        if not isinstance(actions, list):
+            actions = [actions]
+
+        if not self.is_application_action(actions[0]):
             return False
 
-        actual_data = self._prepare_compare_data(action)
+        action_actions_data = [
+            self._prepare_compare_data(action)
+            for action in actions
+        ]
         for config in stored:
-            if config == actual_data:
+            if config in action_actions_data:
                 return True
-
         return False
 
     def _prepare_compare_data(self, action):
-        if isinstance(action, list) and action:
-            action = action[0]
-
         compare_data = {}
         if action and action.label:
             compare_data = {

From 98c065cb8b3c8f75ae0479da1a3287ebbe0b22d6 Mon Sep 17 00:00:00 2001
From: Jakub Trllo <jakub.trllo@gmail.com>
Date: Fri, 9 Sep 2022 14:24:02 +0200
Subject: [PATCH 2/2] change "start_last_workfile" when triggered from group

---
 openpype/tools/launcher/widgets.py | 19 ++++++++++++++-----
 1 file changed, 14 insertions(+), 5 deletions(-)

diff --git a/openpype/tools/launcher/widgets.py b/openpype/tools/launcher/widgets.py
index 62599664fe..774ceb659d 100644
--- a/openpype/tools/launcher/widgets.py
+++ b/openpype/tools/launcher/widgets.py
@@ -312,11 +312,12 @@ class ActionBar(QtWidgets.QWidget):
 
         is_group = index.data(GROUP_ROLE)
         is_variant_group = index.data(VARIANT_GROUP_ROLE)
+        force_not_open_workfile = index.data(FORCE_NOT_OPEN_WORKFILE_ROLE)
         if not is_group and not is_variant_group:
             action = index.data(ACTION_ROLE)
             # Change data of application action
             if issubclass(action, ApplicationAction):
-                if index.data(FORCE_NOT_OPEN_WORKFILE_ROLE):
+                if force_not_open_workfile:
                     action.data["start_last_workfile"] = False
                 else:
                     action.data.pop("start_last_workfile", None)
@@ -385,10 +386,18 @@ class ActionBar(QtWidgets.QWidget):
                 menu.addMenu(sub_menu)
 
         result = menu.exec_(QtGui.QCursor.pos())
-        if result:
-            action = actions_mapping[result]
-            self._start_animation(index)
-            self.action_clicked.emit(action)
+        if not result:
+            return
+
+        action = actions_mapping[result]
+        if issubclass(action, ApplicationAction):
+            if force_not_open_workfile:
+                action.data["start_last_workfile"] = False
+            else:
+                action.data.pop("start_last_workfile", None)
+
+        self._start_animation(index)
+        self.action_clicked.emit(action)
 
 
 class ActionHistory(QtWidgets.QPushButton):