mirror of
https://bitbucket.org/theswgsource/src-1.2.git
synced 2026-07-28 23:16:15 -04:00
the code for trapping script crashes breaks things, apparently... TODO: maybe find the new/proper way to do this since it's kinda important, or just fix our scripts and have no need for crashes
This commit is contained in:
@@ -1324,17 +1324,6 @@ void JavaLibrary::initializeJavaThread()
|
||||
}
|
||||
ms_loaded = 1;
|
||||
|
||||
#ifdef linux
|
||||
if (ConfigServerGame::getTrapScriptCrashes())
|
||||
{
|
||||
//set up signal handler for fatals in linux
|
||||
OurSa.sa_handler = fatalHandler;
|
||||
sigemptyset(&OurSa.sa_mask);
|
||||
OurSa.sa_flags = 0;
|
||||
IGNORE_RETURN(sigaction(SIGSEGV, &OurSa, &JavaSa));
|
||||
}
|
||||
#endif
|
||||
|
||||
// wait until the main thread tells us to shutdown
|
||||
ms_shutdownJava->wait();
|
||||
|
||||
@@ -1342,13 +1331,6 @@ void JavaLibrary::initializeJavaThread()
|
||||
IGNORE_RETURN(ms_jvm->DestroyJavaVM());
|
||||
ms_jvm = NULL;
|
||||
|
||||
#ifdef linux
|
||||
if (ConfigServerGame::getTrapScriptCrashes())
|
||||
{
|
||||
// restore the default signal handler
|
||||
IGNORE_RETURN(sigaction(SIGSEGV, &OrgSa, NULL));
|
||||
}
|
||||
#endif
|
||||
|
||||
#if defined(_WIN32)
|
||||
IGNORE_RETURN(FreeLibrary(static_cast<HMODULE>(libHandle)));
|
||||
|
||||
Reference in New Issue
Block a user