VeraCrypt
aboutsummaryrefslogtreecommitdiff
path: root/src/Main/Forms/VolumePasswordPanel.cpp
diff options
context:
space:
mode:
authorMounir IDRASSI <mounir.idrassi@idrix.fr>2015-06-28 18:19:19 (GMT)
committerMounir IDRASSI <mounir.idrassi@idrix.fr>2015-06-28 18:25:22 (GMT)
commit439e0a9588f83e93b609563bcef0a03b13928534 (patch)
tree371492ae2fdb8c448deaa82358ac26e846f7a021 /src/Main/Forms/VolumePasswordPanel.cpp
parentda8aec4292ab27928f4f9a2f2645c46029de7553 (diff)
downloadVeraCrypt-439e0a9588f83e93b609563bcef0a03b13928534.zip
VeraCrypt-439e0a9588f83e93b609563bcef0a03b13928534.tar.gz
Linux/MacOSX: Add dedicated PIM page in the volume creation wizard. Correct PIM value check logic.
Diffstat (limited to 'src/Main/Forms/VolumePasswordPanel.cpp')
-rw-r--r--[-rwxr-xr-x]src/Main/Forms/VolumePasswordPanel.cpp5
1 files changed, 3 insertions, 2 deletions
diff --git a/src/Main/Forms/VolumePasswordPanel.cpp b/src/Main/Forms/VolumePasswordPanel.cpp
index 5385d6c..8c0133e 100755..100644
--- a/src/Main/Forms/VolumePasswordPanel.cpp
+++ b/src/Main/Forms/VolumePasswordPanel.cpp
@@ -55,8 +55,9 @@ namespace VeraCrypt
PasswordTextCtrl->Show (enablePassword);
DisplayPasswordCheckBox->Show (enablePassword);
- VolumePimTextCtrl->Show (enablePassword);
- VolumePinHelpStaticText->Show (enablePassword);
+ VolumePimStaticText->Show (enablePassword && (!enableConfirmation || (enablePkcs5Prf && !isMountPassword)));
+ VolumePimTextCtrl->Show (enablePassword && (!enableConfirmation || (enablePkcs5Prf && !isMountPassword)));
+ VolumePinHelpStaticText->Show (enablePassword && (!enableConfirmation || (enablePkcs5Prf && !isMountPassword)));
ConfirmPasswordStaticText->Show (enableConfirmation);
ConfirmPasswordTextCtrl->Show (enableConfirmation);