summaryrefslogtreecommitdiffstats
path: root/partitionmanager.cpp
diff options
context:
space:
mode:
authorDees_Troy <dees_troy@yahoo.com>2013-06-19 21:53:57 +0200
committerDees_Troy <dees_troy@teamw.in>2013-07-01 22:48:43 +0200
commit59df9264e3568d3f147dcfa7c5f7945858eb2c65 (patch)
treed18812b2f8d06ac6bbf925b1e1825a1667c6d9fd /partitionmanager.cpp
parentFix MTD Mounting (diff)
downloadandroid_bootable_recovery-59df9264e3568d3f147dcfa7c5f7945858eb2c65.tar
android_bootable_recovery-59df9264e3568d3f147dcfa7c5f7945858eb2c65.tar.gz
android_bootable_recovery-59df9264e3568d3f147dcfa7c5f7945858eb2c65.tar.bz2
android_bootable_recovery-59df9264e3568d3f147dcfa7c5f7945858eb2c65.tar.lz
android_bootable_recovery-59df9264e3568d3f147dcfa7c5f7945858eb2c65.tar.xz
android_bootable_recovery-59df9264e3568d3f147dcfa7c5f7945858eb2c65.tar.zst
android_bootable_recovery-59df9264e3568d3f147dcfa7c5f7945858eb2c65.zip
Diffstat (limited to '')
-rw-r--r--partitionmanager.cpp7
1 files changed, 4 insertions, 3 deletions
diff --git a/partitionmanager.cpp b/partitionmanager.cpp
index d7f1600ef..dd2dfd2c4 100644
--- a/partitionmanager.cpp
+++ b/partitionmanager.cpp
@@ -865,7 +865,7 @@ int TWPartitionManager::Run_Restore(string Restore_Name) {
}
}
} else {
- LOGERR("Unable to locate '%s' partition for restoring.\n", restore_path.c_str());
+ LOGERR("Unable to locate '%s' partition for restoring (restore list).\n", restore_path.c_str());
}
start_pos = end_pos + 1;
end_pos = Restore_List.find(";", start_pos);
@@ -1814,9 +1814,10 @@ void TWPartitionManager::Get_Partition_List(string ListType, std::vector<Partiti
size_t start_pos = 0, end_pos = Restore_List.find(";", start_pos);
while (end_pos != string::npos && start_pos < Restore_List.size()) {
restore_path = Restore_List.substr(start_pos, end_pos - start_pos);
- if ((restore_part = Find_Partition_By_Path(restore_path)) != NULL && !restore_part->Is_SubPartition) {
- if (restore_part->Backup_Name == "recovery") {
+ if ((restore_part = Find_Partition_By_Path(restore_path)) != NULL) {
+ if (restore_part->Backup_Name == "recovery" || restore_part->Is_SubPartition) {
// Don't allow restore of recovery (causes problems on some devices)
+ // Don't add subpartitions to the list of items
} else {
struct PartitionList part;
part.Display_Name = restore_part->Backup_Display_Name;