summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEthan Yonker <dees_troy@teamw.in>2016-09-02 01:40:24 +0200
committerJames Christopher Adduono <jc@adduono.com>2016-09-23 21:42:28 +0200
commitbedb920903819a9543354396e25c27c0efb51961 (patch)
tree8ba36cd856ef5b24e41decbdf557ccb80634ad48
parentMD5 checking: fix issues introduced with adb backup patchset (diff)
downloadandroid_bootable_recovery-bedb920903819a9543354396e25c27c0efb51961.tar
android_bootable_recovery-bedb920903819a9543354396e25c27c0efb51961.tar.gz
android_bootable_recovery-bedb920903819a9543354396e25c27c0efb51961.tar.bz2
android_bootable_recovery-bedb920903819a9543354396e25c27c0efb51961.tar.lz
android_bootable_recovery-bedb920903819a9543354396e25c27c0efb51961.tar.xz
android_bootable_recovery-bedb920903819a9543354396e25c27c0efb51961.tar.zst
android_bootable_recovery-bedb920903819a9543354396e25c27c0efb51961.zip
-rw-r--r--partitionmanager.cpp3
1 files changed, 2 insertions, 1 deletions
diff --git a/partitionmanager.cpp b/partitionmanager.cpp
index 1c7a9702a..20c2aee7f 100644
--- a/partitionmanager.cpp
+++ b/partitionmanager.cpp
@@ -898,6 +898,7 @@ bool TWPartitionManager::Restore_Partition(PartitionSettings *part_settings) {
for (subpart = Partitions.begin(); subpart != Partitions.end(); subpart++) {
part_settings->Part = *subpart;
if ((*subpart)->Is_SubPartition && (*subpart)->SubPartition_Of == parentPart->Mount_Point) {
+ part_settings->Backup_FileName = (*subpart)->Backup_Name + "." + (*subpart)->Current_File_System + ".win";
part_settings->Part = (*subpart);
if (!(*subpart)->Restore(part_settings)) {
TWFunc::SetPerformanceMode(false);
@@ -968,7 +969,7 @@ int TWPartitionManager::Run_Restore(const string& Restore_Name) {
std::vector<TWPartition*>::iterator subpart;
for (subpart = Partitions.begin(); subpart != Partitions.end(); subpart++) {
- part_settings.Backup_FileName = parentPart->Backup_Name + "." + parentPart->Current_File_System + ".win";
+ part_settings.Backup_FileName = (*subpart)->Backup_Name + "." + (*subpart)->Current_File_System + ".win";
part_settings.Part = *subpart;
if ((*subpart)->Is_SubPartition && (*subpart)->SubPartition_Of == parentPart->Mount_Point) {
if (check_md5 > 0 && !(*subpart)->Check_MD5(&part_settings))