From 65eea920fb13134e32ab828028ca0ca5d4e47a02 Mon Sep 17 00:00:00 2001
From: Antoine Martin <antoine@xpra.org>
Date: Fri, 18 Oct 2024 12:44:04 +0700
Subject: [PATCH] #4396 patching fails if there is a tray window

---
 xpra/client/mixins/windows.py | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/xpra/client/mixins/windows.py b/xpra/client/mixins/windows.py
index fb8bef744d..1e3c60b2eb 100644
--- a/xpra/client/mixins/windows.py
+++ b/xpra/client/mixins/windows.py
@@ -956,7 +956,9 @@ def _process_new_common(self, packet: PacketType, override_redirect):
 
     def _find_pid_focused_window(self, pid: int, OR=False) -> int:
         for twid, twin in self._id_to_window.items():
-            if twin._override_redirect != OR:
+            if twin.is_tray():
+                continue
+            if twin.is_OR() != OR:
                 continue
             if twin._metadata.intget("pid", -1) == pid:
                 if OR or twid == self._focused: