diff options
| author | Mounir IDRASSI <mounir.idrassi@idrix.fr> | 2015-06-26 22:01:04 +0200 |
|---|---|---|
| committer | Mounir IDRASSI <mounir.idrassi@idrix.fr> | 2015-06-26 22:07:17 +0200 |
| commit | da8aec4292ab27928f4f9a2f2645c46029de7553 (patch) | |
| tree | 2eb3a1c503bda9f5a601f598a6bce9559f5890d8 /src/Main/TextUserInterface.cpp | |
| parent | d73df9bbd4e70f38a1f1ddc28e7bd45eb0edcc92 (diff) | |
| download | VeraCrypt-da8aec4292ab27928f4f9a2f2645c46029de7553.tar.gz VeraCrypt-da8aec4292ab27928f4f9a2f2645c46029de7553.zip | |
Linux: don't ask for PIM if TrueCryptMode enabled, both in command line and GUI
Diffstat (limited to 'src/Main/TextUserInterface.cpp')
| -rwxr-xr-x[-rw-r--r--] | src/Main/TextUserInterface.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/Main/TextUserInterface.cpp b/src/Main/TextUserInterface.cpp index 190aaf76..50153eb9 100644..100755 --- a/src/Main/TextUserInterface.cpp +++ b/src/Main/TextUserInterface.cpp @@ -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")); |