diff options
| author | Dees_Troy <dees_troy@teamw.in> | 2012-09-25 17:06:46 +0200 |
|---|---|---|
| committer | Dees_Troy <dees_troy@teamw.in> | 2012-09-26 15:00:46 +0200 |
| commit | b46a6849719a8cd1045e08cd2c48f2ef94a2ccf6 (patch) | |
| tree | ac584e693d2894a336815602996150a45049d10a /data.cpp | |
| parent | Fix skip MD5 setting during backup (diff) | |
| download | android_bootable_recovery-b46a6849719a8cd1045e08cd2c48f2ef94a2ccf6.tar android_bootable_recovery-b46a6849719a8cd1045e08cd2c48f2ef94a2ccf6.tar.gz android_bootable_recovery-b46a6849719a8cd1045e08cd2c48f2ef94a2ccf6.tar.bz2 android_bootable_recovery-b46a6849719a8cd1045e08cd2c48f2ef94a2ccf6.tar.lz android_bootable_recovery-b46a6849719a8cd1045e08cd2c48f2ef94a2ccf6.tar.xz android_bootable_recovery-b46a6849719a8cd1045e08cd2c48f2ef94a2ccf6.tar.zst android_bootable_recovery-b46a6849719a8cd1045e08cd2c48f2ef94a2ccf6.zip | |
Diffstat (limited to 'data.cpp')
| -rw-r--r-- | data.cpp | 21 |
1 files changed, 12 insertions, 9 deletions
@@ -605,23 +605,26 @@ void DataManager::SetDefaultValues() str += dev_id; SetValue(TW_BACKUPS_FOLDER_VAR, str, 0); -#ifdef SP1_NAME - if (strlen(EXPAND(SP1_NAME))) mConstValues.insert(make_pair(TW_SP1_PARTITION_NAME_VAR, EXPAND(SP1_NAME))); -#endif -#ifdef SP2_NAME - if (strlen(EXPAND(SP2_NAME))) mConstValues.insert(make_pair(TW_SP1_PARTITION_NAME_VAR, EXPAND(SP2_NAME))); -#endif -#ifdef SP3_NAME - if (strlen(EXPAND(SP3_NAME))) mConstValues.insert(make_pair(TW_SP1_PARTITION_NAME_VAR, EXPAND(SP3_NAME))); -#endif #ifdef SP1_DISPLAY_NAME if (strlen(EXPAND(SP1_DISPLAY_NAME))) mConstValues.insert(make_pair(TW_SP1_PARTITION_NAME_VAR, EXPAND(SP1_DISPLAY_NAME))); +#else + #ifdef SP1_NAME + if (strlen(EXPAND(SP1_NAME))) mConstValues.insert(make_pair(TW_SP1_PARTITION_NAME_VAR, EXPAND(SP1_NAME))); + #endif #endif #ifdef SP2_DISPLAY_NAME if (strlen(EXPAND(SP2_DISPLAY_NAME))) mConstValues.insert(make_pair(TW_SP2_PARTITION_NAME_VAR, EXPAND(SP2_DISPLAY_NAME))); +#else + #ifdef SP2_NAME + if (strlen(EXPAND(SP2_NAME))) mConstValues.insert(make_pair(TW_SP1_PARTITION_NAME_VAR, EXPAND(SP2_NAME))); + #endif #endif #ifdef SP3_DISPLAY_NAME if (strlen(EXPAND(SP3_DISPLAY_NAME))) mConstValues.insert(make_pair(TW_SP3_PARTITION_NAME_VAR, EXPAND(SP3_DISPLAY_NAME))); +#else + #ifdef SP3_NAME + if (strlen(EXPAND(SP3_NAME))) mConstValues.insert(make_pair(TW_SP1_PARTITION_NAME_VAR, EXPAND(SP3_NAME))); + #endif #endif mConstValues.insert(make_pair(TW_REBOOT_SYSTEM, tw_isRebootCommandSupported(rb_system) ? "1" : "0")); |