From 8a4e29711454d3a4b4f5d6301f1b0a4eb2618f07 Mon Sep 17 00:00:00 2001 From: ceikry Date: Sat, 26 Jun 2021 12:09:06 -0500 Subject: [PATCH] Fixed a JVM bug that could cause a crash on linux when minimizing/maximizing --- .../main/kotlin/org/rs09/client/GameLaunch.kt | 3 +++ Client/src/main/resources/fixXinitThreads.cpp | 3 +++ Client/src/main/resources/libfixXInitThreads.so | Bin 0 -> 16072 bytes 3 files changed, 6 insertions(+) create mode 100644 Client/src/main/resources/fixXinitThreads.cpp create mode 100755 Client/src/main/resources/libfixXInitThreads.so diff --git a/Client/src/main/kotlin/org/rs09/client/GameLaunch.kt b/Client/src/main/kotlin/org/rs09/client/GameLaunch.kt index 5e342fb17..77f6cee72 100644 --- a/Client/src/main/kotlin/org/rs09/client/GameLaunch.kt +++ b/Client/src/main/kotlin/org/rs09/client/GameLaunch.kt @@ -26,6 +26,9 @@ object GameLaunch { GameConfig.parse(GameConfig.configLocation) GameConfig.implementHoliday() GameConfig.extendRenderDistance() + if(System.getProperty("os.name").toLowerCase().contains("nux")){ //Fixes crashing due to XInitThreads not being called - JVM bug + System.load(javaClass.classLoader.getResource("libfixXInitThreads.so")!!.file) + } } catch (e: Exception){ GameConfig.IP_ADDRESS = "play.2009scape.org" GameConfig.IP_MANAGEMENT = "play.2009scape.org" diff --git a/Client/src/main/resources/fixXinitThreads.cpp b/Client/src/main/resources/fixXinitThreads.cpp new file mode 100644 index 000000000..276e8793a --- /dev/null +++ b/Client/src/main/resources/fixXinitThreads.cpp @@ -0,0 +1,3 @@ +#include +#include +class a{public: a() { XInitThreads(); }};a X; diff --git a/Client/src/main/resources/libfixXInitThreads.so b/Client/src/main/resources/libfixXInitThreads.so new file mode 100755 index 0000000000000000000000000000000000000000..cbd7ad0d33a79617eec68c4ea5af92de9c580a3c GIT binary patch literal 16072 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