From 515895342820a9d0a35391ec4d316c3782a75768 Mon Sep 17 00:00:00 2001 From: Mounir IDRASSI Date: Sun, 19 Jul 2015 08:46:27 +0200 Subject: User Interface enhancements for PIM --- src/Main/CommandLineInterface.cpp | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) (limited to 'src/Main/CommandLineInterface.cpp') diff --git a/src/Main/CommandLineInterface.cpp b/src/Main/CommandLineInterface.cpp index 7eaef070..c3c82f42 100644 --- a/src/Main/CommandLineInterface.cpp +++ b/src/Main/CommandLineInterface.cpp @@ -378,13 +378,16 @@ namespace VeraCrypt try { ArgNewPim = StringConverter::ToInt32 (wstring (str)); - if (ArgNewPim < 0) - throw_err (LangString["PARAMETER_INCORRECT"] + L": " + str); } catch (...) { throw_err (LangString["PARAMETER_INCORRECT"] + L": " + str); } + + if (ArgNewPim < 0) + throw_err (LangString["PARAMETER_INCORRECT"] + L": " + str); + else if (ArgNewPim > 0 && ArgTrueCryptMode) + throw_err (LangString["PIM_NOT_SUPPORTED_FOR_TRUECRYPT_MODE"]); } if (parser.Found (L"non-interactive")) @@ -403,13 +406,16 @@ namespace VeraCrypt try { ArgPim = StringConverter::ToInt32 (wstring (str)); - if (ArgPim < 0) - throw_err (LangString["PARAMETER_INCORRECT"] + L": " + str); } catch (...) { throw_err (LangString["PARAMETER_INCORRECT"] + L": " + str); } + + if (ArgPim < 0) + throw_err (LangString["PARAMETER_INCORRECT"] + L": " + str); + else if (ArgPim > 0 && ArgTrueCryptMode) + throw_err (LangString["PIM_NOT_SUPPORTED_FOR_TRUECRYPT_MODE"]); } if (parser.Found (L"protect-hidden", &str)) -- cgit v1.2.3