Fix handling of storage with data/media vs data/media/0
Sometimes loading the values from the settings file may set the storage path to /data/media when the proper path is /data/media/0 This commit will grab the storage path from the partition manager to ensure that we are using the proper path. Change-Id: Ibfd63125a2b9705319eb55b09c7e65391757bbc2
This commit is contained in:
7
data.cpp
7
data.cpp
@@ -279,9 +279,10 @@ int DataManager::LoadValues(const string filename)
|
||||
error:
|
||||
fclose(in);
|
||||
string current = GetCurrentStoragePath();
|
||||
string settings = GetSettingsStoragePath();
|
||||
if (current != settings && !PartitionManager.Mount_By_Path(current, false)) {
|
||||
SetValue("tw_storage_path", settings);
|
||||
TWPartition* Part = PartitionManager.Find_Partition_By_Path(current);
|
||||
if (current != Part->Storage_Path && Part->Mount(false)) {
|
||||
LOGINFO("LoadValues setting storage path to '%s'\n", Part->Storage_Path.c_str());
|
||||
SetValue("tw_storage_path", Part->Storage_Path);
|
||||
} else {
|
||||
SetBackupFolder();
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user