diff options
Diffstat (limited to 'Sources/WireGuardApp/UI/macOS/LoginItemHelper/main.m')
-rw-r--r-- | Sources/WireGuardApp/UI/macOS/LoginItemHelper/main.m | 34 |
1 files changed, 15 insertions, 19 deletions
diff --git a/Sources/WireGuardApp/UI/macOS/LoginItemHelper/main.m b/Sources/WireGuardApp/UI/macOS/LoginItemHelper/main.m index 1c37daf..f8a0535 100644 --- a/Sources/WireGuardApp/UI/macOS/LoginItemHelper/main.m +++ b/Sources/WireGuardApp/UI/macOS/LoginItemHelper/main.m @@ -1,5 +1,5 @@ // SPDX-License-Identifier: MIT -// Copyright © 2018-2021 WireGuard LLC. All Rights Reserved. +// Copyright © 2018-2023 WireGuard LLC. All Rights Reserved. #import <Cocoa/Cocoa.h> @@ -14,23 +14,19 @@ int main(int argc, char *argv[]) return 2; uint64_t now = clock_gettime_nsec_np(CLOCK_UPTIME_RAW); if (![[NSData dataWithBytes:&now length:sizeof(now)] writeToURL:[containerUrl URLByAppendingPathComponent:@"login-helper-timestamp.bin"] atomically:YES]) - return 3; - if (@available(macOS 10.15, *)) { - NSCondition *condition = [[NSCondition alloc] init]; - NSURL *appURL = [NSWorkspace.sharedWorkspace URLForApplicationWithBundleIdentifier:appId]; - if (!appURL) - return 4; - NSWorkspaceOpenConfiguration *openConfiguration = [NSWorkspaceOpenConfiguration configuration]; - openConfiguration.activates = NO; - openConfiguration.addsToRecentItems = NO; - openConfiguration.hides = YES; - [NSWorkspace.sharedWorkspace openApplicationAtURL:appURL configuration:openConfiguration completionHandler:^(NSRunningApplication * _Nullable app, NSError * _Nullable error) { - [condition signal]; - }]; - [condition wait]; - } else { - [NSWorkspace.sharedWorkspace launchAppWithBundleIdentifier:appId options:NSWorkspaceLaunchWithoutActivation - additionalEventParamDescriptor:NULL launchIdentifier:NULL]; - } + return 3; + + NSCondition *condition = [[NSCondition alloc] init]; + NSURL *appURL = [NSWorkspace.sharedWorkspace URLForApplicationWithBundleIdentifier:appId]; + if (!appURL) + return 4; + NSWorkspaceOpenConfiguration *openConfiguration = [NSWorkspaceOpenConfiguration configuration]; + openConfiguration.activates = NO; + openConfiguration.addsToRecentItems = NO; + openConfiguration.hides = YES; + [NSWorkspace.sharedWorkspace openApplicationAtURL:appURL configuration:openConfiguration completionHandler:^(NSRunningApplication * _Nullable app, NSError * _Nullable error) { + [condition signal]; + }]; + [condition wait]; return 0; } |