From 1872795445b2f7e6815f8c3c4f8f8059c0648b59 Mon Sep 17 00:00:00 2001 From: Dees_Troy Date: Thu, 20 Jun 2013 15:24:48 -0500 Subject: Fix issue with save/load of zip location --- data.cpp | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/data.cpp b/data.cpp index c6c3d0a74..543bf7cd3 100644 --- a/data.cpp +++ b/data.cpp @@ -544,9 +544,11 @@ void DataManager::SetBackupFolder() SetValue(TW_ZIP_LOCATION_VAR, storage_path); } else { zip_root= zip_path; - zip_root.resize(storage_path.size() + 1); - if (zip_root != storage_path) + zip_root.resize(storage_path.size()); + if (zip_root != storage_path) { + LOGINFO("DataManager::SetBackupFolder zip path was %s changing to %s, %s\n", zip_path.c_str(), storage_path.c_str(), zip_root.c_str()); SetValue(TW_ZIP_LOCATION_VAR, storage_path); + } } } else { if (PartitionManager.Fstab_Processed() != 0) @@ -1086,10 +1088,6 @@ void DataManager::ReadSettingsFile(void) // Remount failed, default back to internal storage SetValue(TW_USE_EXTERNAL_STORAGE, 0); PartitionManager.Mount_Current_Storage(true); - string int_zip_path; - GetValue(TW_ZIP_INTERNAL_VAR, int_zip_path); - SetValue(TW_USE_EXTERNAL_STORAGE, 0); - SetValue(TW_ZIP_LOCATION_VAR, int_zip_path); } } else { PartitionManager.Mount_Current_Storage(true); -- cgit v1.2.3