swg-source-1.2/src-1.2
1
0
Fork 0
mirror of https://bitbucket.org/theswgsource/src-1.2.git synced 2026-07-14 00:01:30 -04:00
Code Issues Projects Releases Wiki Activity

ok this plus (potentially) the removal of those flags makes it work

Browse Source
This commit is contained in:
DarthArgus
2016-02-19 18:40:46 -06:00
parent 467c73574e
commit d3666f0fa3
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
engine/server/library/serverScript/src/shared/JavaLibrary.cpp
+4 -4
View File
@@ -1330,7 +1330,7 @@ void JavaLibrary::initializeJavaThread()
}
ms_loaded = 1;
//#if !defined(JNI_VERSION_1_9) && !defined(JNI_VERSION_1_8) && !defined(JNI_VERSION_1_7) && defined(linux)
#if !defined(JNI_VERSION_1_9) && !defined(JNI_VERSION_1_8) && !defined(JNI_VERSION_1_7) && defined(linux)
if (ConfigServerGame::getTrapScriptCrashes())
{
//set up signal handler for fatals in linux
@@ -1339,7 +1339,7 @@ void JavaLibrary::initializeJavaThread()
OurSa.sa_flags = 0;
IGNORE_RETURN(sigaction(SIGSEGV, &OurSa, &JavaSa));
}
//#endif
#endif
// wait until the main thread tells us to shutdown
ms_shutdownJava->wait();
@@ -1348,13 +1348,13 @@ void JavaLibrary::initializeJavaThread()
IGNORE_RETURN(ms_jvm->DestroyJavaVM());
ms_jvm = nullptr;
//#if !defined(JNI_VERSION_1_9) && !defined(JNI_VERSION_1_8) && !defined(JNI_VERSION_1_7) && defined(linux)
#if !defined(JNI_VERSION_1_9) && !defined(JNI_VERSION_1_8) && !defined(JNI_VERSION_1_7) && defined(linux)
if (ConfigServerGame::getTrapScriptCrashes())
{
// restore the default signal handler
IGNORE_RETURN(sigaction(SIGSEGV, &OrgSa, NULL));
}
//#endif
#endif