Public/VeraCrypt
1
0
Fork 0
mirror of https://github.com/veracrypt/VeraCrypt.git synced 2025-11-11 11:08:02 -06:00
Code Activity

Linux/MacOSX: remove calls to non existent class VolumeLayoutV1Hidden

Browse Source
This commit is contained in:
Mounir IDRASSI
2014-12-20 15:47:04 +01:00
parent 4b9f8b232b
commit 496701851f
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/Main/GraphicUserInterface.cpp
View File

@@ -1366,7 +1366,7 @@ namespace VeraCrypt
if (layout->HasDriveHeader()) if (layout->HasDriveHeader())
continue; continue;
if (!legacyBackup && (typeid (*layout) == typeid (VolumeLayoutV1Normal) || typeid (*layout) == typeid (VolumeLayoutV1Hidden))) if (!legacyBackup && (typeid (*layout) == typeid (VolumeLayoutV1Normal)))
continue; continue;
if (legacyBackup && (typeid (*layout) == typeid (VolumeLayoutV2Normal) || typeid (*layout) == typeid (VolumeLayoutV2Hidden))) if (legacyBackup && (typeid (*layout) == typeid (VolumeLayoutV2Normal) || typeid (*layout) == typeid (VolumeLayoutV2Hidden)))

6
src/Main/TextUserInterface.cpp
View File

@@ -314,7 +314,7 @@ namespace VeraCrypt
if (hiddenVolume) if (hiddenVolume)
{ {
if (typeid (*normalVolume->GetLayout()) == typeid (VolumeLayoutV1Normal) && typeid (*hiddenVolume->GetLayout()) != typeid (VolumeLayoutV1Hidden)) if (typeid (*normalVolume->GetLayout()) == typeid (VolumeLayoutV1Normal))
throw ParameterIncorrect (SRC_POS); throw ParameterIncorrect (SRC_POS);
if (typeid (*normalVolume->GetLayout()) == typeid (VolumeLayoutV2Normal) && typeid (*hiddenVolume->GetLayout()) != typeid (VolumeLayoutV2Hidden)) if (typeid (*normalVolume->GetLayout()) == typeid (VolumeLayoutV2Normal) && typeid (*hiddenVolume->GetLayout()) != typeid (VolumeLayoutV2Hidden))
@@ -1363,7 +1363,7 @@ namespace VeraCrypt
} }
shared_ptr <VolumeLayout> layout = volume->GetLayout(); 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"]); throw_err (LangString ["VOLUME_HAS_NO_BACKUP_HEADER"]);
} }
@@ -1443,7 +1443,7 @@ namespace VeraCrypt
if (layout->HasDriveHeader()) if (layout->HasDriveHeader())
continue; continue;
if (!legacyBackup && (typeid (*layout) == typeid (VolumeLayoutV1Normal) || typeid (*layout) == typeid (VolumeLayoutV1Hidden))) if (!legacyBackup && (typeid (*layout) == typeid (VolumeLayoutV1Normal)))
continue; continue;
if (legacyBackup && (typeid (*layout) == typeid (VolumeLayoutV2Normal) || typeid (*layout) == typeid (VolumeLayoutV2Hidden))) if (legacyBackup && (typeid (*layout) == typeid (VolumeLayoutV2Normal) || typeid (*layout) == typeid (VolumeLayoutV2Hidden)))