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

don't require refresh of NetworkAccessManager, should handle restarts

Browse source
This commit is contained in:
Stephen Birarda 2014-10-06 09:54:52 -07:00
parent 78f8aba504
commit 484c0d30cb
3 changed files with 4 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
domain-server/src/DomainServer.cpp
View file

@ -57,9 +57,6 @@ DomainServer::DomainServer(int argc, char* argv[]) :
setApplicationName("domain-server"); setApplicationName("domain-server");
QSettings::setDefaultFormat(QSettings::IniFormat); QSettings::setDefaultFormat(QSettings::IniFormat);
// force a refresh of the NetworkAccessManager instance for this thread
NetworkAccessManager::getInstance(true);
// make sure we have a fresh AccountManager instance // make sure we have a fresh AccountManager instance
// (need this since domain-server can restart itself and maintain static variables) // (need this since domain-server can restart itself and maintain static variables)
AccountManager::getInstance(true); AccountManager::getInstance(true);

6
libraries/networking/src/NetworkAccessManager.cpp
View file

@ -15,9 +15,9 @@
QThreadStorage<QNetworkAccessManager*> networkAccessManagers; QThreadStorage<QNetworkAccessManager*> networkAccessManagers;
QNetworkAccessManager& NetworkAccessManager::getInstance(bool forceReset) { QNetworkAccessManager& NetworkAccessManager::getInstance() {
if (!networkAccessManagers.hasLocalData() || forceReset) { if (!networkAccessManagers.hasLocalData()) {
networkAccessManagers.setLocalData(new QNetworkAccessManager()); networkAccessManagers.setLocalData(new QNetworkAccessManager());
} }
return *networkAccessManagers.localData(); return *networkAccessManagers.localData();

2
libraries/networking/src/NetworkAccessManager.h
View file

@ -18,7 +18,7 @@
class NetworkAccessManager : public QObject { class NetworkAccessManager : public QObject {
Q_OBJECT Q_OBJECT
public: public:
static QNetworkAccessManager& getInstance(bool forceReset = false); static QNetworkAccessManager& getInstance();
}; };
#endif // hifi_NetworkAccessManager_h #endif // hifi_NetworkAccessManager_h