mirrors/electron
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

Fix autoUpdater error on OS X

Browse source 
If there is no localizedFailureReason, then then this will no longer be
added to the error string (which would result previously in it printing
'(null)' as part of the string)
This commit is contained in:
Adam Buckland 2016-05-01 11:25:27 +01:00
parent 586e5e2ba5
commit abb60ecd2e
1 changed files with 8 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
atom/browser/auto_updater_mac.mm
View file

@ -90,9 +90,14 @@ void AutoUpdater::CheckForUpdates() {
delegate->OnUpdateNotAvailable(); delegate->OnUpdateNotAvailable();
} }
} error:^(NSError *error) { } error:^(NSError *error) {
delegate->OnError(base::SysNSStringToUTF8( NSString *failureString;
[NSString stringWithFormat:@"%@: %@", if(error.localizedFailureReason) {
error.localizedDescription, error.localizedFailureReason])); failureString = [NSString stringWithFormat:@"%@: %@",
error.localizedDescription, error.localizedFailureReason];
} else {
failureString = [NSString stringWithString: error.localizedDescription];
}
delegate->OnError(base::SysNSStringToUTF8(failureString));
}]; }];
} }