From e2415642f07421a9fce7156e68f052b7579ba3fa Mon Sep 17 00:00:00 2001 From: ZappoMan Date: Sun, 9 Mar 2014 00:10:31 -0800 Subject: [PATCH] temporary fix to OSX 10.8 problem by delaying creation of _networkAccessManager --- libraries/shared/src/AccountManager.cpp | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/libraries/shared/src/AccountManager.cpp b/libraries/shared/src/AccountManager.cpp index 888d42ddda..7915a60690 100644 --- a/libraries/shared/src/AccountManager.cpp +++ b/libraries/shared/src/AccountManager.cpp @@ -35,7 +35,7 @@ const QString ACCOUNTS_GROUP = "accounts"; AccountManager::AccountManager() : _authURL(), - _networkAccessManager(new QNetworkAccessManager(this)), + _networkAccessManager(NULL), _pendingCallbackMap(), _accountInfo() { @@ -109,6 +109,11 @@ void AccountManager::authenticatedRequest(const QString& path, QNetworkAccessMan void AccountManager::invokedRequest(const QString& path, QNetworkAccessManager::Operation operation, const JSONCallbackParameters& callbackParams, const QByteArray& dataByteArray) { + + if (!_networkAccessManager) { + _networkAccessManager = new QNetworkAccessManager(this); + } + if (hasValidAccessToken()) { QNetworkRequest authenticatedRequest; @@ -229,6 +234,11 @@ bool AccountManager::checkAndSignalForAccessToken() { } void AccountManager::requestAccessToken(const QString& login, const QString& password) { + + if (!_networkAccessManager) { + _networkAccessManager = new QNetworkAccessManager(this); + } + QNetworkRequest request; QUrl grantURL = _authURL;