Merge pull request #440 from daleglass/disable-crash-logger-by-default

Disable crash logger by default
vircadia · Jun 11, 2020 · e19267e · e19267e
2 parents 2ae3048 + b681f99
commit e19267e
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/interface/src/Menu.cpp b/interface/src/Menu.cpp
@@ -620,7 +620,7 @@ Menu::Menu() {
     addCheckableActionToQMenuAndActionHash(networkMenu,
         MenuOption::DisableCrashLogger,
         0,
-        false,
+        true,
         &UserActivityLogger::getInstance(),
         SLOT(crashMonitorDisable(bool)));
     addActionToQMenuAndActionHash(networkMenu, MenuOption::ShowDSConnectTable, 0,

diff --git a/interface/src/Menu.h b/interface/src/Menu.h
@@ -86,7 +86,7 @@ namespace MenuOption {
     const QString DeleteAvatarEntitiesBookmark = "Delete Avatar Entities Bookmark";
     const QString DeleteBookmark = "Delete Bookmark...";
     const QString DisableActivityLogger = "Disable Activity Logger";
-    const QString DisableCrashLogger = "Disable Crash Logger";
+    const QString DisableCrashLogger = "Disable Crash Reporter";
     const QString DisableEyelidAdjustment = "Disable Eyelid Adjustment";
     const QString DisableLightEntities = "Disable Light Entities";
     const QString DisplayCrashOptions = "Display Crash Options";

diff --git a/libraries/networking/src/UserActivityLogger.h b/libraries/networking/src/UserActivityLogger.h
@@ -59,7 +59,7 @@ private slots:
 private:
     UserActivityLogger();
     Setting::Handle<bool> _disabled { "UserActivityLoggerDisabled", true };
-    Setting::Handle<bool> _crashMonitorDisabled { "CrashMonitorDisabled", false };
+    Setting::Handle<bool> _crashMonitorDisabled { "CrashMonitorDisabled2", true };
 
     QElapsedTimer _timer;
 };