Linux: don't ask for PIM if TrueCryptMode enabled, both in command line and GUI

This commit is contained in:
Mounir IDRASSI
2015-06-26 22:01:04 +02:00
parent d73df9bbd4
commit da8aec4292
6 changed files with 36 additions and 13 deletions

8
src/Main/TextUserInterface.cpp Normal file → Executable file
View File

@@ -444,7 +444,7 @@ namespace VeraCrypt
}
// current PIM
if (!Preferences.NonInteractive && (pim < 0))
if (!truecryptMode && !Preferences.NonInteractive && (pim < 0))
{
pim = AskPim (_("Enter current PIM"));
}
@@ -1120,7 +1120,7 @@ namespace VeraCrypt
if (!options.Password)
options.Password = AskPassword();
if (options.Pim < 0)
if (!options.TrueCryptMode && (options.Pim < 0))
options.Pim = AskPim (_("Enter PIM"));
if (!options.Keyfiles)
@@ -1198,7 +1198,7 @@ namespace VeraCrypt
}
}
if (options.Pim < 0)
if (!options.TrueCryptMode && (options.Pim < 0))
{
options.Pim = AskPim (StringFormatter (_("Enter PIM for {0}"), wstring (*options.Path)));
}
@@ -1217,7 +1217,7 @@ namespace VeraCrypt
{
if (!options.ProtectionPassword)
options.ProtectionPassword = AskPassword (_("Enter password for hidden volume"));
if (options.ProtectionPim < 0)
if (!options.TrueCryptMode && (options.ProtectionPim < 0))
options.ProtectionPim = AskPim (_("Enter PIM for hidden volume"));
if (!options.ProtectionKeyfiles)
options.ProtectionKeyfiles = AskKeyfiles (_("Enter keyfile for hidden volume"));