Merge pull request #17 from DaGaMs/master

Fixed a crash when the UIWebView fails to load with an error
Evernote · Jul 8, 2012 · ac55f61 · ac55f61
2 parents 5d8a90b + f856f59
commit ac55f61
Showing 1 changed file with 9 additions and 11 deletions.
diff --git a/evernote-sdk-ios/internal/ENOAuthViewController.m b/evernote-sdk-ios/internal/ENOAuthViewController.m
@@ -26,6 +26,7 @@ @implementation ENOAuthViewController
 - (void)dealloc
 {
     self.delegate = nil;
+    [self.webView stopLoading];
     [_authorizationURL release];
     [_oauthCallbackPrefix release];
     [_webView release];
@@ -70,17 +71,7 @@ - (void)cancel:(id)sender
     if (self.delegate) {
         [self.delegate oauthViewControllerDidCancel:self];
     }
-}
-
-- (void)viewDidUnload
-{
-    [super viewDidUnload];
-
-    // Release any retained subviews of the main view.
-
-    self.webView.delegate = nil;
-    [self.webView stopLoading];    
-    [_webView release];
+    self.delegate = nil;
 }
 
 - (BOOL)shouldAutorotateToInterfaceOrientation:(UIInterfaceOrientation)interfaceOrientation
@@ -97,6 +88,13 @@ - (void)webView:(UIWebView *)webView didFailLoadWithError:(NSError *)error
         return;
     }
 
+    if (error.code == NSURLErrorCancelled) {
+        // ignore rapid repeated clicking
+        return;
+    }
+
+    [self.webView stopLoading];
+
     if (self.delegate) {
         [self.delegate oauthViewController:self didFailWithError:error];
     }