github/electron
1
1
Fork 0
mirror of https://github.com/electron/electron.git synced 2026-01-25 23:38:18 -05:00
Code Issues Packages Projects Releases Wiki Activity

More general string for OSStatus

Browse Source
This commit is contained in:
Gabriel Handford
2016-11-02 16:26:30 -07:00
committed by Cheng Zhao
parent 2931c27395
commit 54222bdf28
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
atom/common/platform_util_mac.mm
View File

@@ -25,7 +25,7 @@ NSError *PlatformError(NSString* message) {
userInfo:@{NSLocalizedDescriptionKey: message}];
}
NSString *MessageForOSStatus(OSStatus status) {
NSString *MessageForOSStatus(OSStatus status, NSString* defaultMessage) {
switch (status) {
case kLSAppInTrashErr: return @"The application cannot be run because it is inside a Trash folder.";
case kLSUnknownErr: return @"An unknown error has occurred.";
@@ -42,7 +42,7 @@ NSString *MessageForOSStatus(OSStatus status) {
case kLSNoExecutableErr: return @"The executable file is missing or has an unusable format.";
case kLSNoClassicEnvironmentErr: return @"The Classic emulation environment was required but is not available.";
case kLSMultipleSessionsNotSupportedErr: return @"The application to be launched cannot run simultaneously in two different user sessions.";
default: return [NSString stringWithFormat:@"Failed to open (%@)", @(status)];
default: return [NSString stringWithFormat:@"%@ (%@)", defaultMessage, @(status)];
}
}
@@ -55,7 +55,7 @@ NSError* OpenURL(NSURL* ns_url, bool activate) {
NULL,
&openingApp);
if (status != noErr) {
return PlatformError(MessageForOSStatus(status));
return PlatformError(MessageForOSStatus(status, @"Failed to open"));
}
CFRelease(openingApp); // NOT A BUG; LSGetApplicationForURL retains for us