mirror of
https://github.com/overte-org/overte.git
synced 2025-04-20 18:23:54 +02:00
Merge pull request #7791 from birarda/anon-events
use a setting handle for UAL disabled to fix startup race
This commit is contained in:
commit
d2d4ba277d
2 changed files with 6 additions and 7 deletions
|
@ -25,15 +25,12 @@ UserActivityLogger& UserActivityLogger::getInstance() {
|
|||
return sharedInstance;
|
||||
}
|
||||
|
||||
UserActivityLogger::UserActivityLogger() : _disabled(false) {
|
||||
}
|
||||
|
||||
void UserActivityLogger::disable(bool disable) {
|
||||
_disabled = disable;
|
||||
_disabled.set(disable);
|
||||
}
|
||||
|
||||
void UserActivityLogger::logAction(QString action, QJsonObject details, JSONCallbackParameters params) {
|
||||
if (_disabled) {
|
||||
if (_disabled.get()) {
|
||||
return;
|
||||
}
|
||||
|
||||
|
|
|
@ -19,6 +19,8 @@
|
|||
#include <QJsonObject>
|
||||
#include <QNetworkReply>
|
||||
|
||||
#include <SettingHandle.h>
|
||||
|
||||
class UserActivityLogger : public QObject {
|
||||
Q_OBJECT
|
||||
|
||||
|
@ -44,8 +46,8 @@ private slots:
|
|||
void requestError(QNetworkReply& errorReply);
|
||||
|
||||
private:
|
||||
UserActivityLogger();
|
||||
bool _disabled;
|
||||
UserActivityLogger() {};
|
||||
Setting::Handle<bool> _disabled { "UserActivityLoggerDisabled", false };
|
||||
};
|
||||
|
||||
#endif // hifi_UserActivityLogger_h
|
||||
|
|
Loading…
Reference in a new issue