Skip to content
Snippets Groups Projects
Commit 858cde02 authored by Andrey Kleshchev's avatar Andrey Kleshchev
Browse files

SL-19744 Small cleanup

parent cf97837b
Branches
Tags
No related merge requests found
...@@ -104,7 +104,6 @@ BOOL LLApp::sLogInSignal = FALSE; ...@@ -104,7 +104,6 @@ BOOL LLApp::sLogInSignal = FALSE;
// Keeps track of application status // Keeps track of application status
LLScalarCond<LLApp::EAppStatus> LLApp::sStatus{LLApp::APP_STATUS_STOPPED}; LLScalarCond<LLApp::EAppStatus> LLApp::sStatus{LLApp::APP_STATUS_STOPPED};
LLAppErrorHandler LLApp::sErrorHandler = NULL; LLAppErrorHandler LLApp::sErrorHandler = NULL;
BOOL LLApp::sErrorThreadRunning = FALSE;
LLApp::LLApp() LLApp::LLApp()
...@@ -787,13 +786,8 @@ void default_unix_signal_handler(int signum, siginfo_t *info, void *) ...@@ -787,13 +786,8 @@ void default_unix_signal_handler(int signum, siginfo_t *info, void *)
return; return;
} }
// Flag status to ERROR, so thread_error does its work. // Flag status to ERROR
LLApp::setError(); LLApp::setError();
// Block in the signal handler until somebody says that we're done.
while (LLApp::sErrorThreadRunning && !LLApp::isStopped())
{
ms_sleep(10);
}
if (LLApp::sLogInSignal) if (LLApp::sLogInSignal)
{ {
......
...@@ -291,7 +291,6 @@ class LL_COMMON_API LLApp ...@@ -291,7 +291,6 @@ class LL_COMMON_API LLApp
static void setStatus(EAppStatus status); // Use this to change the application status. static void setStatus(EAppStatus status); // Use this to change the application status.
static LLScalarCond<EAppStatus> sStatus; // Reflects current application status static LLScalarCond<EAppStatus> sStatus; // Reflects current application status
static BOOL sErrorThreadRunning; // Set while the error thread is running
static BOOL sDisableCrashlogger; // Let the OS handle crashes for us. static BOOL sDisableCrashlogger; // Let the OS handle crashes for us.
std::wstring mCrashReportPipeStr; //Name of pipe to use for crash reporting. std::wstring mCrashReportPipeStr; //Name of pipe to use for crash reporting.
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment