Merge pull request #16328 from Atlante45/fix/account-settings

DEV-2376: Don't post account settings after pull
This commit is contained in:
Shannon Romano 2019-10-14 08:49:22 -07:00 committed by GitHub
commit 83875089e4
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23

View file

@ -808,6 +808,8 @@ void AccountManager::requestAccountSettings() {
return;
}
qCDebug(networking) << "Requesting the Account Settings from the Metaverse API";
QNetworkAccessManager& networkAccessManager = NetworkAccessManager::getInstance();
QUrl lockerURL = _authURL;
@ -834,6 +836,9 @@ void AccountManager::requestAccountSettingsFinished() {
if (rootObject.contains("status") && rootObject["status"].toString() == "success") {
if (rootObject.contains("data") && rootObject["data"].isObject()) {
_settings.unpack(rootObject["data"].toObject());
_lastSuccessfulSyncTimestamp = _settings.lastChangeTimestamp();
qCDebug(networking) << "Received the Account Settings from the Metaverse API";
emit accountSettingsLoaded();
} else {
@ -874,6 +879,8 @@ void AccountManager::postAccountSettings() {
return;
}
qCDebug(networking) << "Account Settings have changed, pushing them to the Metaverse API";
QNetworkAccessManager& networkAccessManager = NetworkAccessManager::getInstance();
QUrl lockerURL = _authURL;