Merge pull request #3720 from pypeclub/feature/close_settings_lock_on…

…_tray_exit Settings: Remove settings lock on tray exit
ynput · Aug 24, 2022 · b8b5b1d · b8b5b1d
2 parents ab9ed37 + a83f7b5
commit b8b5b1d
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 1 deletion.
diff --git a/openpype/modules/settings_action.py b/openpype/modules/settings_action.py
@@ -23,6 +23,11 @@ def tray_init(self):
  """Initialization in tray implementation of ITrayAction."""
  self.create_settings_window()
 
+ def tray_exit(self):
+ # Close settings UI to remove settings lock
+ if self.settings_window:
+ self.settings_window.close()
+
  def on_action_trigger(self):
  """Implementation for action trigger of ITrayAction."""
  self.show_settings_window()

diff --git a/openpype/tools/settings/settings/dialogs.py b/openpype/tools/settings/settings/dialogs.py
@@ -39,7 +39,7 @@ def __init__(self, message, title, info_obj, parent=None):
  ):
  other_information_layout.addRow(
  label,
- QtWidgets.QLabel(value, other_information)
+ QtWidgets.QLabel(value or "N/A", other_information)
  )
 
  timestamp_label = QtWidgets.QLabel(