Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-09 01:36:56 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Merge pull request #9631 from AndrewMeadows/workaround-avatar-update-dos

Browse source 
Remove avatarEntityData cruft from settings
This commit is contained in:
Seth Alves 2017-02-09 10:40:00 -08:00 committed by GitHub
commit b34341b48e
2 changed files with 14 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
interface/src/avatar/MyAvatar.cpp
View file

@ -795,6 +795,11 @@ void MyAvatar::saveData() {
} }
settings.endArray(); settings.endArray();
if (_avatarEntityData.size() == 0) {
// HACK: manually remove empty 'avatarEntityData' else deleted avatarEntityData may show up in settings file
settings.remove("avatarEntityData");
}
settings.beginWriteArray("avatarEntityData"); settings.beginWriteArray("avatarEntityData");
int avatarEntityIndex = 0; int avatarEntityIndex = 0;
auto hmdInterface = DependencyManager::get<HMDScriptingInterface>(); auto hmdInterface = DependencyManager::get<HMDScriptingInterface>();
@ -931,6 +936,10 @@ void MyAvatar::loadData() {
updateAvatarEntity(entityID, properties); updateAvatarEntity(entityID, properties);
} }
settings.endArray(); settings.endArray();
if (avatarEntityCount == 0) {
// HACK: manually remove empty 'avatarEntityData' else legacy data may persist in settings file
settings.remove("avatarEntityData");
}
setAvatarEntityDataChanged(true); setAvatarEntityDataChanged(true);
setDisplayName(settings.value("displayName").toString()); setDisplayName(settings.value("displayName").toString());

8
libraries/shared/src/SettingHandle.cpp
View file

@ -28,9 +28,10 @@ QString Settings::fileName() const {
} }
void Settings::remove(const QString& key) { void Settings::remove(const QString& key) {
if (key == "" || _manager->contains(key)) { // NOTE: you can't check _manager->contains(key) here because it will return 'false'
_manager->remove(key); // when the key is a valid child group with child keys.
} // However, calling remove() without checking will do the right thing.
_manager->remove(key);
} }
QStringList Settings::childGroups() const { QStringList Settings::childGroups() const {
@ -46,6 +47,7 @@ QStringList Settings::allKeys() const {
} }
bool Settings::contains(const QString& key) const { bool Settings::contains(const QString& key) const {
// NOTE: this will return 'false' if key is a valid child group with child keys.
return _manager->contains(key); return _manager->contains(key);
} }