From 8f09ebacf5ecdea9760c6c0367d5694c3c9c6972 Mon Sep 17 00:00:00 2001 From: Aria Moradi Date: Fri, 4 Jun 2021 23:10:40 +0430 Subject: [PATCH 1/2] dummy file to trigger gh actions --- dummy | 1 + 1 file changed, 1 insertion(+) create mode 100644 dummy diff --git a/dummy b/dummy new file mode 100644 index 00000000..2f9a76d2 --- /dev/null +++ b/dummy @@ -0,0 +1 @@ +bluh From c96da7905809e09db00f83925e84907ef14b58b1 Mon Sep 17 00:00:00 2001 From: Syer10 Date: Sat, 5 Jun 2021 14:06:36 -0400 Subject: [PATCH 2/2] Fix MacOS crashing on launch (#132) --- .../main/kotlin/suwayomi/tachidesk/server/util/SystemTray.kt | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/server/src/main/kotlin/suwayomi/tachidesk/server/util/SystemTray.kt b/server/src/main/kotlin/suwayomi/tachidesk/server/util/SystemTray.kt index 3fc347cc..774c937b 100644 --- a/server/src/main/kotlin/suwayomi/tachidesk/server/util/SystemTray.kt +++ b/server/src/main/kotlin/suwayomi/tachidesk/server/util/SystemTray.kt @@ -24,6 +24,10 @@ object SystemTray { CacheUtil.clear(BuildConfig.NAME) + if (System.getProperty("os.name").startsWith("Mac")) { + SystemTray.FORCE_TRAY_TYPE = SystemTray.TrayType.Awt + } + val systemTray = SystemTray.get(BuildConfig.NAME) ?: return null val mainMenu = systemTray.menu