diff options
author | Maki <maki@hotmilk.space> | 2024-05-15 20:58:28 -0400 |
---|---|---|
committer | Maki <maki@hotmilk.space> | 2024-05-15 20:58:28 -0400 |
commit | ec23d45e2e9a87147641fed6f8c3ef6083c2f878 (patch) | |
tree | 169edbab006d8bbd86b2980ab98fb62e097067ff /indra/linux_crash_logger/llcrashloggerlinux.cpp | |
parent | 8d824e8923b26c7a1d858e6cb587be1cf7d4dfeb (diff) | |
parent | 2f25f87ee719a79efc8316079f3c881eddb4d266 (diff) |
Merge branch 'release/maint-b' into pipewire-linux-volume-catcher
Diffstat (limited to 'indra/linux_crash_logger/llcrashloggerlinux.cpp')
-rw-r--r-- | indra/linux_crash_logger/llcrashloggerlinux.cpp | 40 |
1 files changed, 20 insertions, 20 deletions
diff --git a/indra/linux_crash_logger/llcrashloggerlinux.cpp b/indra/linux_crash_logger/llcrashloggerlinux.cpp index 22182d32a4..7992f59b36 100644 --- a/indra/linux_crash_logger/llcrashloggerlinux.cpp +++ b/indra/linux_crash_logger/llcrashloggerlinux.cpp @@ -30,7 +30,7 @@ #include "linden_common.h" -#include "indra_constants.h" // CRASH_BEHAVIOR_ASK, CRASH_SETTING_NAME +#include "indra_constants.h" // CRASH_BEHAVIOR_ASK, CRASH_SETTING_NAME #include "llerror.h" #include "llfile.h" #include "lltimer.h" @@ -53,7 +53,7 @@ static const char dialog_title[] = static BOOL do_ask_dialog(void) { - // Ask to send crash report. Yes/No dialog. + // Ask to send crash report. Yes/No dialog. } LLCrashLoggerLinux::LLCrashLoggerLinux(void) @@ -70,31 +70,31 @@ void LLCrashLoggerLinux::gatherPlatformSpecificFiles() bool LLCrashLoggerLinux::frame() { - bool send_logs = true; - if(CRASH_BEHAVIOR_ASK == getCrashBehavior()) - { - send_logs = do_ask_dialog(); - } - else if(CRASH_BEHAVIOR_NEVER_SEND == getCrashBehavior()) - { - send_logs = false; - } - - if(send_logs) - { - sendCrashLogs(); - } - return true; + bool send_logs = true; + if(CRASH_BEHAVIOR_ASK == getCrashBehavior()) + { + send_logs = do_ask_dialog(); + } + else if(CRASH_BEHAVIOR_NEVER_SEND == getCrashBehavior()) + { + send_logs = false; + } + + if(send_logs) + { + sendCrashLogs(); + } + return true; } bool LLCrashLoggerLinux::cleanup() { - commonCleanup(); + commonCleanup(); mKeyMaster.releaseMaster(); - return true; + return true; } void LLCrashLoggerLinux::updateApplication(const std::string& message) { - LLCrashLogger::updateApplication(message); + LLCrashLogger::updateApplication(message); } |