Skip to content
Snippets Groups Projects
Commit 5056ba6d authored by Oz Linden's avatar Oz Linden
Browse files

remove unused exception handler

parent 675842a2
No related branches found
No related tags found
No related merge requests found
......@@ -68,25 +68,9 @@ namespace
int gArgC;
char** gArgV;
LLAppViewerMacOSX* gViewerAppPtr = NULL;
void (*gOldTerminateHandler)() = NULL;
std::string gHandleSLURL;
}
static void exceptionTerminateHandler()
{
// reinstall default terminate() handler in case we re-terminate.
if (gOldTerminateHandler) std::set_terminate(gOldTerminateHandler);
// treat this like a regular viewer crash, with nice stacktrace etc.
long *null_ptr;
null_ptr = 0;
*null_ptr = 0xDEADBEEF; //Force an exception that will trigger breakpad.
LLAppViewer::handleViewerCrash();
// we've probably been killed-off before now, but...
gOldTerminateHandler(); // call old terminate() handler
}
void constructViewer()
{
// Set the working dir to <bundle>/Contents/Resources
......@@ -99,9 +83,6 @@ void constructViewer()
gViewerAppPtr = new LLAppViewerMacOSX();
// install unexpected exception handler
//gOldTerminateHandler = std::set_terminate(exceptionTerminateHandler);
gViewerAppPtr->setErrorHandler(LLAppViewer::handleViewerCrash);
}
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment