Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-07-28 18:00:21 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #7791 from birarda/anon-events

Browse source 
use a setting handle for UAL disabled to fix startup race
This commit is contained in:
Brad Hefta-Gaub 2016-04-28 19:11:09 -07:00
commit d2d4ba277d
2 changed files with 6 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
libraries/networking/src/UserActivityLogger.cpp
View file

@ -25,15 +25,12 @@ UserActivityLogger& UserActivityLogger::getInstance() {
return sharedInstance; return sharedInstance;
} }
UserActivityLogger::UserActivityLogger() : _disabled(false) {
}
void UserActivityLogger::disable(bool disable) { void UserActivityLogger::disable(bool disable) {
_disabled = disable; _disabled.set(disable);
} }
void UserActivityLogger::logAction(QString action, QJsonObject details, JSONCallbackParameters params) { void UserActivityLogger::logAction(QString action, QJsonObject details, JSONCallbackParameters params) {
if (_disabled) { if (_disabled.get()) {
return; return;
} }

6
libraries/networking/src/UserActivityLogger.h
View file

@ -19,6 +19,8 @@
#include <QJsonObject> #include <QJsonObject>
#include <QNetworkReply> #include <QNetworkReply>
#include <SettingHandle.h>
class UserActivityLogger : public QObject { class UserActivityLogger : public QObject {
Q_OBJECT Q_OBJECT
@ -44,8 +46,8 @@ private slots:
void requestError(QNetworkReply& errorReply); void requestError(QNetworkReply& errorReply);
private: private:
UserActivityLogger(); UserActivityLogger() {};
bool _disabled; Setting::Handle<bool> _disabled { "UserActivityLoggerDisabled", false };
}; };
#endif // hifi_UserActivityLogger_h #endif // hifi_UserActivityLogger_h