From e2920fa237cb0b69b82838e4c453ac7af48f7e48 Mon Sep 17 00:00:00 2001 From: Dees_Troy Date: Wed, 19 Sep 2012 16:18:00 -0400 Subject: Fix ext storage and zip paths Fix a bug with handling external storage during boot. Check zip root path when switching storage and ensure that the path is in the new storage path to prevent user confusion. --- data.cpp | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'data.cpp') diff --git a/data.cpp b/data.cpp index 505a3a1d8..21293641c 100644 --- a/data.cpp +++ b/data.cpp @@ -840,11 +840,15 @@ void DataManager::ReadSettingsFile(void) GetValue(TW_HAS_EXTERNAL, has_ext); if (has_dual != 0 && use_ext == 1) { // Attempt to sdcard using external storage - if (PartitionManager.Mount_Current_Storage(false)) { + if (!PartitionManager.Mount_Current_Storage(false)) { LOGE("Failed to mount external storage, using internal storage.\n"); // 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