diff options
| author | Peter Bozsó | 2016-06-14 21:16:18 +0200 |
|---|---|---|
| committer | Alexander Tkachev | 2016-08-24 16:07:55 +0600 |
| commit | c1ffb09fb0e75a96e48299c1df0742f357e5d03d (patch) | |
| tree | 88ebd99ef46c46fdda1fc7c7419d0244f6ce8e9e | |
| parent | 3db4915b663d989c01a0e8bf7f8d10a6be754432 (diff) | |
| download | scummvm-rg350-c1ffb09fb0e75a96e48299c1df0742f357e5d03d.tar.gz scummvm-rg350-c1ffb09fb0e75a96e48299c1df0742f357e5d03d.tar.bz2 scummvm-rg350-c1ffb09fb0e75a96e48299c1df0742f357e5d03d.zip | |
CLOUD: Fix configuration handling in CloudManager
| -rw-r--r-- | backends/cloud/cloudmanager.cpp | 34 |
1 files changed, 12 insertions, 22 deletions
diff --git a/backends/cloud/cloudmanager.cpp b/backends/cloud/cloudmanager.cpp index 19551213cd..8b104dfb20 100644 --- a/backends/cloud/cloudmanager.cpp +++ b/backends/cloud/cloudmanager.cpp @@ -78,9 +78,6 @@ void CloudManager::loadStorage() { } void CloudManager::init() { - Common::String oldDomain = ConfMan.getActiveDomainName(); - ConfMan.setActiveDomain(ConfMan.kCloudDomain); - //init configs structs for (uint32 i = 0; i < kStorageTotal; ++i) { Common::String name = getStorageConfigName(i); @@ -89,43 +86,36 @@ void CloudManager::init() { config.username = ""; config.lastSyncDate = ""; config.usedBytes = 0; - if (ConfMan.hasKey(kStoragePrefix + name + "_username")) - config.username = ConfMan.get(kStoragePrefix + name + "_username"); - if (ConfMan.hasKey(kStoragePrefix + name + "_lastSync")) - config.lastSyncDate = ConfMan.get(kStoragePrefix + name + "_lastSync"); - if (ConfMan.hasKey(kStoragePrefix + name + "_usedBytes")) - config.usedBytes = ConfMan.get(kStoragePrefix + name + "_usedBytes").asUint64(); + if (ConfMan.hasKey(kStoragePrefix + name + "_username", ConfMan.kCloudDomain)) + config.username = ConfMan.get(kStoragePrefix + name + "_username", ConfMan.kCloudDomain); + if (ConfMan.hasKey(kStoragePrefix + name + "_lastSync", ConfMan.kCloudDomain)) + config.lastSyncDate = ConfMan.get(kStoragePrefix + name + "_lastSync", ConfMan.kCloudDomain); + if (ConfMan.hasKey(kStoragePrefix + name + "_usedBytes", ConfMan.kCloudDomain)) + config.usedBytes = ConfMan.get(kStoragePrefix + name + "_usedBytes", ConfMan.kCloudDomain).asUint64(); _storages.push_back(config); } //load an active storage if there is any _currentStorageIndex = kStorageNoneId; - if (ConfMan.hasKey("current_storage")) - _currentStorageIndex = ConfMan.getInt("current_storage"); + if (ConfMan.hasKey("current_storage", ConfMan.kCloudDomain)) + _currentStorageIndex = ConfMan.getInt("current_storage", ConfMan.kCloudDomain); loadStorage(); - - ConfMan.setActiveDomain(oldDomain); } void CloudManager::save() { - Common::String oldDomain = ConfMan.getActiveDomainName(); - ConfMan.setActiveDomain(ConfMan.kCloudDomain); - for (uint32 i = 0; i < _storages.size(); ++i) { if (i == kStorageNoneId) continue; Common::String name = getStorageConfigName(i); - ConfMan.set(kStoragePrefix + name + "_username", _storages[i].username); - ConfMan.set(kStoragePrefix + name + "_lastSync", _storages[i].lastSyncDate); - ConfMan.set(kStoragePrefix + name + "_usedBytes", Common::String::format("%llu", _storages[i].usedBytes)); + ConfMan.set(kStoragePrefix + name + "_username", _storages[i].username, ConfMan.kCloudDomain); + ConfMan.set(kStoragePrefix + name + "_lastSync", _storages[i].lastSyncDate, ConfMan.kCloudDomain); + ConfMan.set(kStoragePrefix + name + "_usedBytes", Common::String::format("%llu", _storages[i].usedBytes, ConfMan.kCloudDomain)); } - ConfMan.set("current_storage", Common::String::format("%d", _currentStorageIndex)); + ConfMan.set("current_storage", Common::String::format("%d", _currentStorageIndex, ConfMan.kCloudDomain)); if (_activeStorage) _activeStorage->saveConfig(kStoragePrefix + getStorageConfigName(_currentStorageIndex) + "_"); ConfMan.flushToDisk(); - - ConfMan.setActiveDomain(oldDomain); } void CloudManager::replaceStorage(Storage *storage, uint32 index) { |