From c664151ab2975ad19012f3deba083477b0042c40 Mon Sep 17 00:00:00 2001 From: Petr Kalis Date: Tue, 1 Jun 2021 13:39:40 +0200 Subject: [PATCH] Console to system tray - implemented Harmony --- openpype/hooks/pre_with_windows_shell.py | 3 +-- openpype/scripts/non_python_host_launch.py | 8 ++------ 2 files changed, 3 insertions(+), 8 deletions(-) diff --git a/openpype/hooks/pre_with_windows_shell.py b/openpype/hooks/pre_with_windows_shell.py index 16047ae66f..8049118680 100644 --- a/openpype/hooks/pre_with_windows_shell.py +++ b/openpype/hooks/pre_with_windows_shell.py @@ -14,8 +14,7 @@ class LaunchWithWindowsShell(PreLaunchHook): # Should be as last hook because must change launch arguments to string order = 1000 - app_groups = ["nuke", "nukex", "hiero", "nukestudio", - "harmony"] + app_groups = ["nuke", "nukex", "hiero", "nukestudio"] platforms = ["windows"] def execute(self): diff --git a/openpype/scripts/non_python_host_launch.py b/openpype/scripts/non_python_host_launch.py index ba5ac5d035..32c4b23f4f 100644 --- a/openpype/scripts/non_python_host_launch.py +++ b/openpype/scripts/non_python_host_launch.py @@ -80,16 +80,12 @@ def main(argv): launch_args = sys_args[after_script_idx:] host_name = os.environ["AVALON_APP"].lower() - launch_method = None if host_name == "photoshop": from avalon.photoshop.lib import main - launch_method = main elif host_name == "aftereffects": from avalon.aftereffects.lib import main - launch_method = main elif host_name == "harmony": - from avalon.harmony.lib import launch - launch_method = launch + from avalon.harmony.lib import main else: title = "Unknown host name" message = ( @@ -101,7 +97,7 @@ def main(argv): if launch_args: # Launch host implementation - launch_method(*launch_args) + main(*launch_args) else: # Show message box on_invalid_args(after_script_idx is None)