From 9c01ddaf638f19988fefcef76cd6b516d4cfc57c Mon Sep 17 00:00:00 2001
From: Jakub Trllo <43494761+iLLiCiTiT@users.noreply.github.com>
Date: Wed, 24 Jul 2024 15:47:08 +0200
Subject: [PATCH 1/3] make starting tray check faster

---
 client/ayon_core/tools/tray/lib.py | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/client/ayon_core/tools/tray/lib.py b/client/ayon_core/tools/tray/lib.py
index e13c682ab0..16a6770d82 100644
--- a/client/ayon_core/tools/tray/lib.py
+++ b/client/ayon_core/tools/tray/lib.py
@@ -122,6 +122,10 @@ def _wait_for_starting_tray(
         if data.get("started") is True:
             return data
 
+        pid = data.get("pid")
+        if pid and not _is_process_running(pid):
+            return None
+
         if time.time() - started_at > timeout:
             return None
         time.sleep(0.1)

From a4de305fde378698ae59cfe4d66472213a7024c9 Mon Sep 17 00:00:00 2001
From: Jakub Trllo <43494761+iLLiCiTiT@users.noreply.github.com>
Date: Wed, 24 Jul 2024 16:31:10 +0200
Subject: [PATCH 2/3] remove tray filepath if pid is not running

---
 client/ayon_core/tools/tray/lib.py | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/client/ayon_core/tools/tray/lib.py b/client/ayon_core/tools/tray/lib.py
index 16a6770d82..abe8a7a11d 100644
--- a/client/ayon_core/tools/tray/lib.py
+++ b/client/ayon_core/tools/tray/lib.py
@@ -278,7 +278,12 @@ def remove_tray_server_url(force: Optional[bool] = False):
     except BaseException:
         data = {}
 
-    if force or not data or data.get("pid") == os.getpid():
+    if (
+        force
+        or not data
+        or data.get("pid") == os.getpid()
+        or not _is_process_running(data.get("pid"))
+    ):
         os.remove(filepath)
 
 

From 17e04cd8849216b85557e32293936abce85f7344 Mon Sep 17 00:00:00 2001
From: Jakub Trllo <43494761+iLLiCiTiT@users.noreply.github.com>
Date: Wed, 24 Jul 2024 16:31:23 +0200
Subject: [PATCH 3/3] call 'remove_tray_server_url' in wait for tray to start

---
 client/ayon_core/tools/tray/lib.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/client/ayon_core/tools/tray/lib.py b/client/ayon_core/tools/tray/lib.py
index abe8a7a11d..2c3a577641 100644
--- a/client/ayon_core/tools/tray/lib.py
+++ b/client/ayon_core/tools/tray/lib.py
@@ -124,6 +124,7 @@ def _wait_for_starting_tray(
 
         pid = data.get("pid")
         if pid and not _is_process_running(pid):
+            remove_tray_server_url()
             return None
 
         if time.time() - started_at > timeout: