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

Catch the exception thrown from Squirrel

Browse source
This commit is contained in:
Cheng Zhao 2015-03-25 19:59:36 +08:00
parent 665363b356
commit ee71b2044e
1 changed files with 11 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

16
atom/browser/auto_updater_mac.mm
View file

@ -36,15 +36,21 @@ void RelaunchToInstallUpdate() {
// static // static
void AutoUpdater::SetFeedURL(const std::string& feed) { void AutoUpdater::SetFeedURL(const std::string& feed) {
if (g_updater == nil) { if (g_updater == nil) {
// Initialize the SQRLUpdater.
NSURL* url = [NSURL URLWithString:base::SysUTF8ToNSString(feed)];
NSURLRequest* urlRequest = [NSURLRequest requestWithURL:url];
g_updater = [[SQRLUpdater alloc] initWithUpdateRequest:urlRequest];
AutoUpdaterDelegate* delegate = GetDelegate(); AutoUpdaterDelegate* delegate = GetDelegate();
if (!delegate) if (!delegate)
return; return;
// Initialize the SQRLUpdater.
NSURL* url = [NSURL URLWithString:base::SysUTF8ToNSString(feed)];
NSURLRequest* urlRequest = [NSURLRequest requestWithURL:url];
@try {
g_updater = [[SQRLUpdater alloc] initWithUpdateRequest:urlRequest];
} @catch (NSException* error) {
delegate->OnError(base::SysNSStringToUTF8(error.reason));
return;
}
[[g_updater rac_valuesForKeyPath:@"state" observer:g_updater] [[g_updater rac_valuesForKeyPath:@"state" observer:g_updater]
subscribeNext:^(NSNumber *stateNumber) { subscribeNext:^(NSNumber *stateNumber) {
int state = [stateNumber integerValue]; int state = [stateNumber integerValue];