From b165276bd5a2bceb95a22f04cf7d7bb383bd6ba9 Mon Sep 17 00:00:00 2001 From: crschnick Date: Sun, 29 Oct 2023 07:09:56 +0000 Subject: [PATCH] Add macos logo --- app/src/main/java/io/xpipe/app/core/App.java | 2 +- .../java/io/xpipe/app/core/mode/BaseMode.java | 2 +- .../resources/img/logo/logo_macos_128x128.png | Bin 0 -> 9281 bytes 3 files changed, 2 insertions(+), 2 deletions(-) create mode 100644 app/src/main/resources/io/xpipe/app/resources/img/logo/logo_macos_128x128.png diff --git a/app/src/main/java/io/xpipe/app/core/App.java b/app/src/main/java/io/xpipe/app/core/App.java index 597b0f377..7856bc2f8 100644 --- a/app/src/main/java/io/xpipe/app/core/App.java +++ b/app/src/main/java/io/xpipe/app/core/App.java @@ -37,7 +37,7 @@ public class App extends Application { // This is necessary in case XPipe was started through a script as it will have no icon otherwise if (OsType.getLocal().equals(OsType.MACOS) && AppProperties.get().isDeveloperMode() && AppLogs.get().isWriteToSysout()) { try { - var iconUrl = Main.class.getResourceAsStream("resources/img/logo/logo_128x128.png"); + var iconUrl = Main.class.getResourceAsStream("resources/img/logo/logo_macos_128x128.png"); if (iconUrl != null) { var awtIcon = ImageIO.read(iconUrl); Taskbar.getTaskbar().setIconImage(awtIcon); diff --git a/app/src/main/java/io/xpipe/app/core/mode/BaseMode.java b/app/src/main/java/io/xpipe/app/core/mode/BaseMode.java index 981136ad3..3110b903c 100644 --- a/app/src/main/java/io/xpipe/app/core/mode/BaseMode.java +++ b/app/src/main/java/io/xpipe/app/core/mode/BaseMode.java @@ -69,9 +69,9 @@ public class BaseMode extends OperationMode { DataStorage.reset(); AppPrefs.reset(); AppExtensionManager.reset(); + AppDataLock.unlock(); // Shut down socket server last to keep a non-daemon thread running AppSocketServer.reset(); - AppDataLock.unlock(); TrackEvent.info("mode", "Background mode shutdown finished"); } } diff --git a/app/src/main/resources/io/xpipe/app/resources/img/logo/logo_macos_128x128.png b/app/src/main/resources/io/xpipe/app/resources/img/logo/logo_macos_128x128.png new file mode 100644 index 0000000000000000000000000000000000000000..e54974a40582286f29345d6f2a2b27817c7878dd GIT binary patch literal 9281 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