Showing the changes to interface/src/Application.cpp (1 of 9 files). Show all
Unified · Split
| @@ -1439,17 +1439,9 @@ Application::Application(int& argc, char** argv, QElapsedTimer& startupTimer, bo · 1438 unmodified lines | |||
| 1439 | // add firstRun flag from settings to launch event | 1439 | // add firstRun flag from settings to launch event |
| 1440 | Setting::Handle<bool> firstRun { Settings::firstRun, true }; | 1440 | Setting::Handle<bool> firstRun { Settings::firstRun, true }; |
| 1441 | 1441 | ||
| 1442 | // once the settings have been loaded, check if we need to flip the default for UserActivityLogger | ||
| 1443 | auto& userActivityLogger = UserActivityLogger::getInstance(); | ||
| 1444 | if (!userActivityLogger.isDisabledSettingSet()) { | ||
| 1445 | // the user activity logger is opt-out for Interface | ||
| 1446 | // but it's defaulted to disabled for other targets | ||
| 1447 | // so we need to enable it here if it has never been disabled by the user | ||
| 1448 | userActivityLogger.disable(false); | ||
| 1449 | } | ||
| 1450 | |||
| 1451 | QString machineFingerPrint = uuidStringWithoutCurlyBraces(FingerprintUtils::getMachineFingerprint()); | 1442 | QString machineFingerPrint = uuidStringWithoutCurlyBraces(FingerprintUtils::getMachineFingerprint()); |
| 1452 | 1443 | ||
| 1444 | auto& userActivityLogger = UserActivityLogger::getInstance(); | ||
| 1453 | if (userActivityLogger.isEnabled()) { | 1445 | if (userActivityLogger.isEnabled()) { |
| 1454 | // sessionRunTime will be reset soon by loadSettings. Grab it now to get previous session value. | 1446 | // sessionRunTime will be reset soon by loadSettings. Grab it now to get previous session value. |
| 1455 | // The value will be 0 if the user blew away settings this session, which is both a feature and a bug. | 1447 | // The value will be 0 if the user blew away settings this session, which is both a feature and a bug. |