Browse Source

Fix autoUpdater error on OS X

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)
Adam Buckland 9 years ago
parent
commit
abb60ecd2e
1 changed files with 8 additions and 3 deletions
  1. 8 3
      atom/browser/auto_updater_mac.mm

+ 8 - 3
atom/browser/auto_updater_mac.mm

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