History

Merge pull request #13553 from Atlante45/feat/crashpad-mac

Add Crashpad to Mac

John Conklin II committed 8 years ago

Commit de33ca52 parents b036c7f 85f56e29 files · +110 −42Browse files

Showing the changes to interface/src/Application.cpp (1 of 9 files). Show all

Unified · Split

interface/src/Application.cpp+1−4
@@ -1448,8 +1448,6 @@ Application::Application(int& argc, char** argv, QElapsedTimer& startupTimer, bo · 1447 unmodified lines
14481448 // add firstRun flag from settings to launch event
14491449 Setting::Handle<bool> firstRun { Settings::firstRun, true };
14501450
1451− QString machineFingerPrint = uuidStringWithoutCurlyBraces(FingerprintUtils::getMachineFingerprint());
1452−
14531451 auto& userActivityLogger = UserActivityLogger::getInstance();
14541452 if (userActivityLogger.isEnabled()) {
14551453 // 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
15011499 properties["first_run"] = firstRun.get();
15021500
15031501 // add the user's machine ID to the launch event
1502+ QString machineFingerPrint = uuidStringWithoutCurlyBraces(FingerprintUtils::getMachineFingerprint());
15041503 properties["machine_fingerprint"] = machineFingerPrint;
15051504
15061505 userActivityLogger.logAction("launch", properties);
15071506 }
15081507
1509− setCrashAnnotation("machine_fingerprint", machineFingerPrint.toStdString());
1510−
15111508 _entityEditSender.setMyAvatar(myAvatar.get());
15121509
15131510 // The entity octree will have to know about MyAvatar for the parentJointName import