Add Crashpad to Mac
Showing the changes to interface/src/Application.cpp (1 of 9 files). Show all
Unified · Split
| @@ -1448,8 +1448,6 @@ Application::Application(int& argc, char** argv, QElapsedTimer& startupTimer, bo · 1447 unmodified lines | |||
| 1448 | // add firstRun flag from settings to launch event | 1448 | // add firstRun flag from settings to launch event |
| 1449 | Setting::Handle<bool> firstRun { Settings::firstRun, true }; | 1449 | Setting::Handle<bool> firstRun { Settings::firstRun, true }; |
| 1450 | 1450 | ||
| 1451 | QString machineFingerPrint = uuidStringWithoutCurlyBraces(FingerprintUtils::getMachineFingerprint()); | ||
| 1452 | |||
| 1453 | auto& userActivityLogger = UserActivityLogger::getInstance(); | 1451 | auto& userActivityLogger = UserActivityLogger::getInstance(); |
| 1454 | if (userActivityLogger.isEnabled()) { | 1452 | if (userActivityLogger.isEnabled()) { |
| 1455 | // sessionRunTime will be reset soon by loadSettings. Grab it now to get previous session value. | 1453 | // sessionRunTime will be reset soon by loadSettings. Grab it now to get previous session value. |
| @@ -1501,13 +1499,12 @@ Application::Application(int& argc, char** argv, QElapsedTimer& startupTimer, bo · 45 unmodified lines | |||
| 1501 | properties["first_run"] = firstRun.get(); | 1499 | properties["first_run"] = firstRun.get(); |
| 1502 | 1500 | ||
| 1503 | // add the user's machine ID to the launch event | 1501 | // add the user's machine ID to the launch event |
| 1502 | QString machineFingerPrint = uuidStringWithoutCurlyBraces(FingerprintUtils::getMachineFingerprint()); | ||
| 1504 | properties["machine_fingerprint"] = machineFingerPrint; | 1503 | properties["machine_fingerprint"] = machineFingerPrint; |
| 1505 | 1504 | ||
| 1506 | userActivityLogger.logAction("launch", properties); | 1505 | userActivityLogger.logAction("launch", properties); |
| 1507 | } | 1506 | } |
| 1508 | 1507 | ||
| 1509 | setCrashAnnotation("machine_fingerprint", machineFingerPrint.toStdString()); | ||
| 1510 | |||
| 1511 | _entityEditSender.setMyAvatar(myAvatar.get()); | 1508 | _entityEditSender.setMyAvatar(myAvatar.get()); |
| 1512 | 1509 | ||
| 1513 | // The entity octree will have to know about MyAvatar for the parentJointName import | 1510 | // The entity octree will have to know about MyAvatar for the parentJointName import |