diff --git a/interface/src/Menu.cpp b/interface/src/Menu.cpp index a567033c2f..08a0246c1b 100644 --- a/interface/src/Menu.cpp +++ b/interface/src/Menu.cpp @@ -608,7 +608,7 @@ Menu::Menu() { 0, false, &UserActivityLogger::getInstance(), - SLOT(crashDisable(bool))); + SLOT(crashMonitorDisable(bool))); addActionToQMenuAndActionHash(networkMenu, MenuOption::ShowDSConnectTable, 0, qApp, SLOT(loadDomainConnectionDialog())); diff --git a/interface/src/main.cpp b/interface/src/main.cpp index 27171a5828..4c99fa8be4 100644 --- a/interface/src/main.cpp +++ b/interface/src/main.cpp @@ -218,12 +218,12 @@ int main(int argc, const char* argv[]) { } qDebug() << "UserActivityLogger is enabled:" << ual.isEnabled(); - if (ual.isCrashEnabled()) { + qDebug() << "Crash handler logger is enabled:" << ual.isCrashMonitorEnabled(); + if (ual.isCrashMonitorEnabled()) { auto crashHandlerStarted = startCrashHandler(argv[0]); qDebug() << "Crash handler started:" << crashHandlerStarted; } - const QString& applicationName = getInterfaceSharedMemoryName(); bool instanceMightBeRunning = true; #ifdef Q_OS_WIN diff --git a/libraries/networking/src/UserActivityLogger.cpp b/libraries/networking/src/UserActivityLogger.cpp index ec04d03851..94d6371ba4 100644 --- a/libraries/networking/src/UserActivityLogger.cpp +++ b/libraries/networking/src/UserActivityLogger.cpp @@ -34,8 +34,8 @@ void UserActivityLogger::disable(bool disable) { _disabled.set(disable); } -void UserActivityLogger::crashDisable(bool disable) { - _crashDisabled.set(disable); +void UserActivityLogger::crashMonitorDisable(bool disable) { + _crashMonitorDisabled.set(disable); } void UserActivityLogger::logAction(QString action, QJsonObject details, JSONCallbackParameters params) { diff --git a/libraries/networking/src/UserActivityLogger.h b/libraries/networking/src/UserActivityLogger.h index 881c287341..98a707155e 100644 --- a/libraries/networking/src/UserActivityLogger.h +++ b/libraries/networking/src/UserActivityLogger.h @@ -35,11 +35,11 @@ public slots: bool isEnabled() { return !_disabled.get(); } bool isDisabledSettingSet() const { return _disabled.isSet(); } - bool isCrashEnabled() { return !_crashDisabled.get(); } - bool isCrashDisabledSettingSet() const { return _crashDisabled.isSet(); } + bool isCrashMonitorEnabled() { return !_crashMonitorDisabled.get(); } + bool isCrashMonitorDisabledSettingSet() const { return _crashMonitorDisabled.isSet(); } void disable(bool disable); - void crashDisable(bool disable); + void crashMonitorDisable(bool disable); void logAction(QString action, QJsonObject details = QJsonObject(), JSONCallbackParameters params = JSONCallbackParameters()); void launch(QString applicationVersion, bool previousSessionCrashed, int previousSessionRuntime); @@ -59,7 +59,7 @@ private slots: private: UserActivityLogger(); Setting::Handle _disabled { "UserActivityLoggerDisabled", true }; - Setting::Handle _crashDisabled { "CrashLoggerDisabled", false }; + Setting::Handle _crashMonitorDisabled { "CrashMonitorDisabled", false }; QElapsedTimer _timer; };