From 3b92f7d093a2c70ba53daf738476e31bb773a31e Mon Sep 17 00:00:00 2001
From: crschnick <crschnick@xpipe.io>
Date: Wed, 9 Aug 2023 14:12:27 +0000
Subject: [PATCH] macOS fixes

---
 app/src/main/java/io/xpipe/app/core/AppTray.java         | 9 +++++++--
 .../resources/img/os/{apple-dark.svg => macos-dark.svg}  | 0
 .../xpipe/app/resources/img/os/{apple.svg => macos.svg}  | 0
 3 files changed, 7 insertions(+), 2 deletions(-)
 rename app/src/main/resources/io/xpipe/app/resources/img/os/{apple-dark.svg => macos-dark.svg} (100%)
 rename app/src/main/resources/io/xpipe/app/resources/img/os/{apple.svg => macos.svg} (100%)

diff --git a/app/src/main/java/io/xpipe/app/core/AppTray.java b/app/src/main/java/io/xpipe/app/core/AppTray.java
index fa8d174f..db98c0fc 100644
--- a/app/src/main/java/io/xpipe/app/core/AppTray.java
+++ b/app/src/main/java/io/xpipe/app/core/AppTray.java
@@ -13,6 +13,7 @@ import java.awt.*;
 import java.lang.reflect.Field;
 import java.time.Duration;
 import java.time.Instant;
+import java.util.Arrays;
 
 public class AppTray {
 
@@ -76,9 +77,13 @@ public class AppTray {
 
         // Remove functionality to show stage when primary clicked and replace it with our own
         SwingUtilities.invokeLater(() -> {
-            privateTrayIcon.removeActionListener(privateTrayIcon.getActionListeners()[0]);
+            for (var l : Arrays.stream(privateTrayIcon.getActionListeners()).toList()) {
+                privateTrayIcon.removeActionListener(l);
+            }
             privateTrayIcon.addActionListener(e -> {
-                OperationMode.switchToAsync(OperationMode.GUI);
+                if (OsType.getLocal() != OsType.MACOS) {
+                    OperationMode.switchToAsync(OperationMode.GUI);
+                }
             });
         });
 
diff --git a/app/src/main/resources/io/xpipe/app/resources/img/os/apple-dark.svg b/app/src/main/resources/io/xpipe/app/resources/img/os/macos-dark.svg
similarity index 100%
rename from app/src/main/resources/io/xpipe/app/resources/img/os/apple-dark.svg
rename to app/src/main/resources/io/xpipe/app/resources/img/os/macos-dark.svg
diff --git a/app/src/main/resources/io/xpipe/app/resources/img/os/apple.svg b/app/src/main/resources/io/xpipe/app/resources/img/os/macos.svg
similarity index 100%
rename from app/src/main/resources/io/xpipe/app/resources/img/os/apple.svg
rename to app/src/main/resources/io/xpipe/app/resources/img/os/macos.svg