From 439e0a9588f83e93b609563bcef0a03b13928534 Mon Sep 17 00:00:00 2001
From: Mounir IDRASSI <mounir.idrassi@idrix.fr>
Date: Sun, 28 Jun 2015 20:19:19 +0200
Subject: Linux/MacOSX: Add dedicated PIM page in the volume creation wizard.
 Correct PIM value check logic.

---
 src/Main/Forms/VolumePasswordPanel.cpp | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)
 mode change 100755 => 100644 src/Main/Forms/VolumePasswordPanel.cpp

(limited to 'src/Main/Forms/VolumePasswordPanel.cpp')

diff --git a/src/Main/Forms/VolumePasswordPanel.cpp b/src/Main/Forms/VolumePasswordPanel.cpp
old mode 100755
new mode 100644
index 5385d6c8..8c0133eb
--- 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);
-- 
cgit v1.2.3