From 74fb2e94d5ff09d4b5871ca33160862f72a641b6 Mon Sep 17 00:00:00 2001 From: Dees_Troy Date: Mon, 15 Apr 2013 14:35:47 +0000 Subject: Fix some issues with wipe partition list Change-Id: Ie7d5878faf86b8fa824b72211be7fd3596b471d7 --- partition.cpp | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'partition.cpp') diff --git a/partition.cpp b/partition.cpp index 7b687e721..f92d62f21 100644 --- a/partition.cpp +++ b/partition.cpp @@ -480,7 +480,7 @@ bool TWPartition::Process_Flags(string Flags, bool Display_Error) { Storage_Name = Display_Name; if (!has_display_name && has_storage_name) Display_Name = Storage_Name; - if (has_display_name && !has_backup_name) + if (has_display_name && !has_backup_name && Backup_Display_Name != "Android Secure") Backup_Display_Name = Display_Name; if (!has_display_name && has_backup_name) Display_Name = Backup_Display_Name; @@ -1158,6 +1158,9 @@ bool TWPartition::Wipe_Encryption() { return false; Has_Data_Media = false; + Decrypted_Block_Device = ""; + Is_Decrypted = false; + Is_Encrypted = false; if (Wipe(Fstab_File_System)) { Has_Data_Media = Save_Data_Media; if (Has_Data_Media && !Symlink_Mount_Point.empty()) { -- cgit v1.2.3