From 496701851f31bf46486ad71f5bcf500fd0385603 Mon Sep 17 00:00:00 2001 From: Mounir IDRASSI Date: Sat, 20 Dec 2014 15:47:04 +0100 Subject: Linux/MacOSX: remove calls to non existent class VolumeLayoutV1Hidden --- src/Main/GraphicUserInterface.cpp | 2 +- src/Main/TextUserInterface.cpp | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) (limited to 'src') diff --git a/src/Main/GraphicUserInterface.cpp b/src/Main/GraphicUserInterface.cpp index 8ff05c4e..78e0e34d 100755 --- a/src/Main/GraphicUserInterface.cpp +++ b/src/Main/GraphicUserInterface.cpp @@ -1366,7 +1366,7 @@ namespace VeraCrypt if (layout->HasDriveHeader()) continue; - if (!legacyBackup && (typeid (*layout) == typeid (VolumeLayoutV1Normal) || typeid (*layout) == typeid (VolumeLayoutV1Hidden))) + if (!legacyBackup && (typeid (*layout) == typeid (VolumeLayoutV1Normal))) continue; if (legacyBackup && (typeid (*layout) == typeid (VolumeLayoutV2Normal) || typeid (*layout) == typeid (VolumeLayoutV2Hidden))) diff --git a/src/Main/TextUserInterface.cpp b/src/Main/TextUserInterface.cpp index 9cc5232d..cf5c9154 100755 --- a/src/Main/TextUserInterface.cpp +++ b/src/Main/TextUserInterface.cpp @@ -314,7 +314,7 @@ namespace VeraCrypt if (hiddenVolume) { - if (typeid (*normalVolume->GetLayout()) == typeid (VolumeLayoutV1Normal) && typeid (*hiddenVolume->GetLayout()) != typeid (VolumeLayoutV1Hidden)) + if (typeid (*normalVolume->GetLayout()) == typeid (VolumeLayoutV1Normal)) throw ParameterIncorrect (SRC_POS); if (typeid (*normalVolume->GetLayout()) == typeid (VolumeLayoutV2Normal) && typeid (*hiddenVolume->GetLayout()) != typeid (VolumeLayoutV2Hidden)) @@ -1363,7 +1363,7 @@ namespace VeraCrypt } shared_ptr layout = volume->GetLayout(); - if (typeid (*layout) == typeid (VolumeLayoutV1Normal) || typeid (*layout) == typeid (VolumeLayoutV1Hidden)) + if (typeid (*layout) == typeid (VolumeLayoutV1Normal)) { throw_err (LangString ["VOLUME_HAS_NO_BACKUP_HEADER"]); } @@ -1443,7 +1443,7 @@ namespace VeraCrypt if (layout->HasDriveHeader()) continue; - if (!legacyBackup && (typeid (*layout) == typeid (VolumeLayoutV1Normal) || typeid (*layout) == typeid (VolumeLayoutV1Hidden))) + if (!legacyBackup && (typeid (*layout) == typeid (VolumeLayoutV1Normal))) continue; if (legacyBackup && (typeid (*layout) == typeid (VolumeLayoutV2Normal) || typeid (*layout) == typeid (VolumeLayoutV2Hidden))) -- cgit v1.2.3