Bug 1498: Remembered password is not used for reconnects

https://winscp.net/tracker/1498 Source commit: 6e17df85822233a9d8bedfd7479d036baf8bf95d
winscp · Jan 28, 2018 · a5e1e1b · a5e1e1b
1 parent 7bfbfdf
commit a5e1e1b
Showing 1 changed file with 4 additions and 4 deletions.
diff --git a/source/core/Terminal.cpp b/source/core/Terminal.cpp
@@ -1199,11 +1199,7 @@ void __fastcall TTerminal::ResetConnection()
   FTunnelError = L"";
 
   FRememberedPasswordTried = false;
-  // Particularly to prevent reusing a wrong client certificate passphrase
-  // from a previous login attempt
-  FRememberedPassword = UnicodeString();
   FRememberedTunnelPasswordTried = false;
-  FRememberedTunnelPassword = UnicodeString();
 
   if (FDirectoryChangesCache != NULL)
   {
@@ -1408,6 +1404,10 @@ void __fastcall TTerminal::Open()
         {
           FFingerprintScanned = FFileSystem->GetSessionInfo().CertificateFingerprint;
         }
+        // Particularly to prevent reusing a wrong client certificate passphrase
+        // in the next login attempt
+        FRememberedPassword = UnicodeString();
+        FRememberedTunnelPassword = UnicodeString();
         throw;
       }
     }