VeraCrypt
aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMounir IDRASSI <mounir.idrassi@idrix.fr>2014-12-20 15:47:04 +0100
committerMounir IDRASSI <mounir.idrassi@idrix.fr>2014-12-20 15:48:00 +0100
commit496701851f31bf46486ad71f5bcf500fd0385603 (patch)
treea698e6f8e1220a460329ea1e0d1c51cb2d0ed3b1
parent4b9f8b232b956149850fc1c8b47f826a09044efa (diff)
downloadVeraCrypt-496701851f31bf46486ad71f5bcf500fd0385603.tar.gz
VeraCrypt-496701851f31bf46486ad71f5bcf500fd0385603.zip
Linux/MacOSX: remove calls to non existent class VolumeLayoutV1Hidden
-rwxr-xr-xsrc/Main/GraphicUserInterface.cpp2
-rwxr-xr-xsrc/Main/TextUserInterface.cpp6
2 files changed, 4 insertions, 4 deletions
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 <VolumeLayout> 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)))