diff options
| -rw-r--r-- | src/Mount/Mount.c | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/src/Mount/Mount.c b/src/Mount/Mount.c index 2df08684..2bbb8af8 100644 --- a/src/Mount/Mount.c +++ b/src/Mount/Mount.c @@ -6320,11 +6320,8 @@ BOOL CALLBACK MainDialogProc (HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lPa if (!EffectiveVolumeTrueCryptMode)
EffectiveVolumeTrueCryptMode = DefaultVolumeTrueCryptMode;
- // Cached password
- mounted = MountVolume (hwndDlg, szDriveLetter[0] - L'A', szFileName, NULL, EffectiveVolumePkcs5, CmdVolumePim, EffectiveVolumeTrueCryptMode, bCacheInDriver, bIncludePimInCache, bForceMount, &mountOptions, Silent, FALSE);
-
// Command line password or keyfiles
- if (!mounted && (CmdVolumePassword.Length != 0 || (FirstCmdKeyFile && (CmdVolumePasswordValid || bEffectiveTryEmptyPasswordWhenKeyfileUsed))))
+ if (CmdVolumePassword.Length != 0 || (FirstCmdKeyFile && (CmdVolumePasswordValid || bEffectiveTryEmptyPasswordWhenKeyfileUsed)))
{
BOOL reportBadPasswd = CmdVolumePassword.Length > 0;
@@ -6337,6 +6334,11 @@ BOOL CALLBACK MainDialogProc (HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lPa burn (&CmdVolumePassword, sizeof (CmdVolumePassword));
}
+ else
+ {
+ // Cached password
+ mounted = MountVolume (hwndDlg, szDriveLetter[0] - L'A', szFileName, NULL, EffectiveVolumePkcs5, CmdVolumePim, EffectiveVolumeTrueCryptMode, bCacheInDriver, bIncludePimInCache, bForceMount, &mountOptions, Silent, FALSE);
+ }
if (FirstCmdKeyFile)
{
|