From da8aec4292ab27928f4f9a2f2645c46029de7553 Mon Sep 17 00:00:00 2001 From: Mounir IDRASSI Date: Fri, 26 Jun 2015 22:01:04 +0200 Subject: Linux: don't ask for PIM if TrueCryptMode enabled, both in command line and GUI --- src/Main/TextUserInterface.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) mode change 100644 => 100755 src/Main/TextUserInterface.cpp (limited to 'src/Main/TextUserInterface.cpp') diff --git a/src/Main/TextUserInterface.cpp b/src/Main/TextUserInterface.cpp old mode 100644 new mode 100755 index 190aaf76..50153eb9 --- 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")); -- cgit v1.2.3