Fixes #311

Piwigo · Jul 7, 2019 · 03d59ed · 03d59ed
1 parent 5fad0d1
commit 03d59ed
Showing 1 changed file with 3 additions and 6 deletions.
diff --git a/piwigo/Login/LoginViewController.m b/piwigo/Login/LoginViewController.m
@@ -268,11 +268,12 @@ -(void)launchLogin
         // If Piwigo server requires HTTP basic authentication, ask credentials
         if ([Model sharedInstance].performedHTTPauthentication){
             // Without prior knowledge, the app already tried Piwigo credentials
-            // But unsuccessfully, so must now request HTTP credentials
+            // but unsuccessfully, so must now request HTTP credentials
             [self requestHttpCredentialsAfterError:error];
         } else {
             // HTTPS login request failed ?
-            if ([[Model sharedInstance].serverProtocol isEqualToString:@"https://"])
+            if ([[Model sharedInstance].serverProtocol isEqualToString:@"https://"] &&
+                ![Model sharedInstance].userCancelledCommunication)
             {
                 // Suggest HTTP connection if HTTPS attempt failed
                 [self tryNonSecuredAccessAfterError:error];
@@ -752,10 +753,6 @@ - (void)cancelLoggingIn
         if (hud) {
             // Update text
             hud.detailsLabel.text = NSLocalizedString(@"internetCancellingConnection_button", @"Cancelling Connection…");;
-
-            // Reconfigure the button
-            [hud.button isSelected];
-            [hud.button removeTarget:self action:@selector(hideLoading) forControlEvents:UIControlEventTouchUpInside];
         }
     });
 }