From 4adc33ebff988504175b09165ba34f644fc795ee Mon Sep 17 00:00:00 2001 From: Ethan Yonker Date: Fri, 22 Jan 2016 16:07:11 -0600 Subject: Fix (Auto Generate) handling for backup names Change-Id: I29f3823d03c005fb55a0e0a98818d40bd1eb039d --- partitionmanager.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'partitionmanager.cpp') diff --git a/partitionmanager.cpp b/partitionmanager.cpp index 5dd2ce5f3..00c4f8fdd 100644 --- a/partitionmanager.cpp +++ b/partitionmanager.cpp @@ -447,7 +447,7 @@ int TWPartitionManager::Check_Backup_Name(bool Display_Error) { // and -_.{}[] } else { if (Display_Error) - gui_msg(Msg(msg::kError, "backup_name_invalid=Backup name '{1}' contains invalid character: '{1}'")(backup_name)((char)cur_char)); + gui_msg(Msg(msg::kError, "backup_name_invalid=Backup name '{1}' contains invalid character: '{1}'")(Backup_Name)((char)cur_char)); return -3; } } @@ -682,9 +682,9 @@ int TWPartitionManager::Run_Backup(void) { DataManager::GetValue(TW_BACKUPS_FOLDER_VAR, Backup_Folder); DataManager::GetValue(TW_BACKUP_NAME, Backup_Name); - if (Backup_Name == gui_parse_text("{@current_date}")) { + if (Backup_Name == gui_lookup("curr_date", "(Current Date)")) { Backup_Name = TWFunc::Get_Current_Date(); - } else if (Backup_Name == gui_parse_text("{@auto_generate}") || Backup_Name == "0" || Backup_Name.empty()) { + } else if (Backup_Name == gui_lookup("auto_generate", "(Auto Generate)") || Backup_Name == "0" || Backup_Name.empty()) { TWFunc::Auto_Generate_Backup_Name(); DataManager::GetValue(TW_BACKUP_NAME, Backup_Name); } -- cgit v1.2.3