summaryrefslogtreecommitdiffstats
path: root/gui
diff options
context:
space:
mode:
authorEthan Yonker <dees_troy@teamw.in>2016-01-22 23:07:11 +0100
committerEthan Yonker <dees_troy@teamw.in>2016-01-22 23:08:07 +0100
commit4adc33ebff988504175b09165ba34f644fc795ee (patch)
tree7e2ae4a2c66db42ced5d5ea282f1f98bcb82f156 /gui
parentgui: language EN fixes (diff)
downloadandroid_bootable_recovery-4adc33ebff988504175b09165ba34f644fc795ee.tar
android_bootable_recovery-4adc33ebff988504175b09165ba34f644fc795ee.tar.gz
android_bootable_recovery-4adc33ebff988504175b09165ba34f644fc795ee.tar.bz2
android_bootable_recovery-4adc33ebff988504175b09165ba34f644fc795ee.tar.lz
android_bootable_recovery-4adc33ebff988504175b09165ba34f644fc795ee.tar.xz
android_bootable_recovery-4adc33ebff988504175b09165ba34f644fc795ee.tar.zst
android_bootable_recovery-4adc33ebff988504175b09165ba34f644fc795ee.zip
Diffstat (limited to 'gui')
-rw-r--r--gui/action.cpp5
-rw-r--r--gui/pages.cpp6
2 files changed, 6 insertions, 5 deletions
diff --git a/gui/action.cpp b/gui/action.cpp
index 803d31355..711f64506 100644
--- a/gui/action.cpp
+++ b/gui/action.cpp
@@ -1169,9 +1169,8 @@ int GUIAction::nandroid(std::string arg)
if (arg == "backup") {
string Backup_Name;
DataManager::GetValue(TW_BACKUP_NAME, Backup_Name);
- string auto_gen = gui_lookup("auto_gen", "(Auto Generate)");
- string curr_date = gui_lookup("curr_date", "(Current Date)");
- if (Backup_Name == "(Auto Generate)" || Backup_Name == "(Current Date)" || Backup_Name == "0" || Backup_Name == "(" || PartitionManager.Check_Backup_Name(true) == 0) {
+ string auto_gen = gui_lookup("auto_generate", "(Auto Generate)");
+ if (Backup_Name == auto_gen || Backup_Name == gui_lookup("curr_date", "(Current Date)") || Backup_Name == "0" || Backup_Name == "(" || PartitionManager.Check_Backup_Name(true) == 0) {
ret = PartitionManager.Run_Backup();
}
else {
diff --git a/gui/pages.cpp b/gui/pages.cpp
index 932be6b32..ddf53a92c 100644
--- a/gui/pages.cpp
+++ b/gui/pages.cpp
@@ -687,6 +687,7 @@ int PageSet::LoadLanguage(char* languageFile, ZipArchive* package)
xml_node<>* parent;
xml_node<>* child;
std::string resource_source;
+ int ret = 0;
if (languageFile) {
printf("parsing languageFile\n");
@@ -717,9 +718,10 @@ int PageSet::LoadLanguage(char* languageFile, ZipArchive* package)
if (child)
mResources->LoadResources(child, package, resource_source);
else
- return -1;
+ ret = -1;
+ DataManager::SetValue("tw_backup_name", gui_lookup("auto_generate", "(Auto Generate)"));
lang.clear();
- return 0;
+ return ret;
}
int PageSet::Load(ZipArchive* package, char* xmlFile, char* languageFile, char* baseLanguageFile)