Skip to content

Commit 7a21c09

Browse files
committed
only change activation policy if it's not already set
1 parent 45c5a8c commit 7a21c09

File tree

1 file changed

+7
-3
lines changed

1 file changed

+7
-3
lines changed

src/main/native/org_cryptomator_macos_tray_ActivationPolicy_Native.m

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,11 +11,15 @@
1111

1212
JNIEXPORT void JNICALL Java_org_cryptomator_macos_tray_ActivationPolicy_00024Native_transformToAccessory
1313
(JNIEnv *env, jobject thisObj) {
14-
[NSApp setActivationPolicy:NSApplicationActivationPolicyAccessory];
14+
if (NSApp.activationPolicy != NSApplicationActivationPolicyAccessory) {
15+
[NSApp setActivationPolicy:NSApplicationActivationPolicyAccessory];
16+
}
1517
}
1618

1719
JNIEXPORT void JNICALL Java_org_cryptomator_macos_tray_ActivationPolicy_00024Native_transformToRegular
1820
(JNIEnv *env, jobject thisObj) {
19-
[NSApp activateIgnoringOtherApps:YES];
20-
[NSApp setActivationPolicy:NSApplicationActivationPolicyRegular];
21+
if (NSApp.activationPolicy != NSApplicationActivationPolicyRegular) {
22+
[NSApp activateIgnoringOtherApps:YES];
23+
[NSApp setActivationPolicy:NSApplicationActivationPolicyRegular];
24+
}
2125
}

0 commit comments

Comments
 (0)