From dd8f6e4edbca5ef684f8ad3ce2931582fc27d70f Mon Sep 17 00:00:00 2001 From: Hayden Date: Fri, 1 Jan 2021 10:31:26 -0500 Subject: [PATCH 1/2] Fix typo --- Natives/JavaLauncher.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Natives/JavaLauncher.c b/Natives/JavaLauncher.c index 6a9f84af..e39f707f 100644 --- a/Natives/JavaLauncher.c +++ b/Natives/JavaLauncher.c @@ -59,7 +59,7 @@ int launchJVM(int argc, char *argv[]) { margv[margc++] = "/usr/lib/jvm/java-16-openjdk/bin/java"; margv[margc++] = "-XstartOnFirstThread"; margv[margc++] = "-Djava.library.path=/Applications/PojavLauncher.app/Frameworks"; - matgv[margc++] = "-Dorg.lwjgl.opengl.libname=libGL.dylib"; + margv[margc++] = "-Dorg.lwjgl.opengl.libname=libGL.dylib"; char jvmargs[10000]; FILE* argsFile = fopen(args_path, "r"); debug("Reading custom JVM args (overrideargs.txt), opened=%d\n", argsFile != NULL); From e5905c57ab771e29c8b7ef66356a139336e4e938 Mon Sep 17 00:00:00 2001 From: Hayden Date: Mon, 1 Feb 2021 17:59:26 -0500 Subject: [PATCH 2/2] Fix rare crash when libjemalloc-dev is installed A better fix in the future would be to figure out why jemalloc causes it to crash. --- Natives/JavaLauncher.c | 1 + 1 file changed, 1 insertion(+) diff --git a/Natives/JavaLauncher.c b/Natives/JavaLauncher.c index e39f707f..325b50ff 100644 --- a/Natives/JavaLauncher.c +++ b/Natives/JavaLauncher.c @@ -60,6 +60,7 @@ int launchJVM(int argc, char *argv[]) { margv[margc++] = "-XstartOnFirstThread"; margv[margc++] = "-Djava.library.path=/Applications/PojavLauncher.app/Frameworks"; margv[margc++] = "-Dorg.lwjgl.opengl.libname=libGL.dylib"; + margv[margc++] = "-Dorg.lwjgl.system.allocator=system"; char jvmargs[10000]; FILE* argsFile = fopen(args_path, "r"); debug("Reading custom JVM args (overrideargs.txt), opened=%d\n", argsFile != NULL);