From 02eb4ccd3393287d3d8be08f152659e7d33e01c9 Mon Sep 17 00:00:00 2001 From: Dale Glass Date: Thu, 11 Jun 2020 01:26:21 +0200 Subject: [PATCH 1/2] Disable crash logger by default --- interface/src/Menu.cpp | 2 +- libraries/networking/src/UserActivityLogger.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/interface/src/Menu.cpp b/interface/src/Menu.cpp index b07117b4be..d5547b0d58 100644 --- 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/libraries/networking/src/UserActivityLogger.h b/libraries/networking/src/UserActivityLogger.h index 98a707155e..0a4103109f 100644 --- a/libraries/networking/src/UserActivityLogger.h +++ b/libraries/networking/src/UserActivityLogger.h @@ -59,7 +59,7 @@ private slots: private: UserActivityLogger(); Setting::Handle _disabled { "UserActivityLoggerDisabled", true }; - Setting::Handle _crashMonitorDisabled { "CrashMonitorDisabled", false }; + Setting::Handle _crashMonitorDisabled { "CrashMonitorDisabled", true }; QElapsedTimer _timer; }; From b681f99d213aa0f829d360884bb034a1deea1d0f Mon Sep 17 00:00:00 2001 From: Dale Glass Date: Thu, 11 Jun 2020 20:00:47 +0200 Subject: [PATCH 2/2] Rename the crash reporting settings to force new default value Doing this ensures the new default applies to all clients, without having to reset the configuration. --- interface/src/Menu.h | 2 +- libraries/networking/src/UserActivityLogger.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/interface/src/Menu.h b/interface/src/Menu.h index e337b6188a..a3da179ad3 100644 --- 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 index 0a4103109f..39efee03c4 100644 --- a/libraries/networking/src/UserActivityLogger.h +++ b/libraries/networking/src/UserActivityLogger.h @@ -59,7 +59,7 @@ private slots: private: UserActivityLogger(); Setting::Handle _disabled { "UserActivityLoggerDisabled", true }; - Setting::Handle _crashMonitorDisabled { "CrashMonitorDisabled", true }; + Setting::Handle _crashMonitorDisabled { "CrashMonitorDisabled2", true }; QElapsedTimer _timer; };