From 0862f32f5ed85a4a9aabeefbca89d1f0fb8d08ce Mon Sep 17 00:00:00 2001 From: khanhduytran0 Date: Sun, 1 Oct 2023 21:03:18 +0700 Subject: [PATCH] Fix[JavaLauncher]: null check for glLibName Add missing null check for be86b5f Fixes #615 --- Natives/JavaLauncher.m | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/Natives/JavaLauncher.m b/Natives/JavaLauncher.m index b361cd34..78768f46 100644 --- a/Natives/JavaLauncher.m +++ b/Natives/JavaLauncher.m @@ -186,14 +186,14 @@ int launchJVM(NSString *username, id launchTarget, int width, int height, int mi margv[++margc] = "-Dlog4j2.formatMsgNoLookups=true"; // Preset OpenGL libname - const char *glLibName; - if (!strcmp(getenv("POJAV_RENDERER"), "auto")) { - // workaround only applies to 1.20.2+ - glLibName = RENDERER_NAME_MTL_ANGLE; - } else { - glLibName = getenv("POJAV_RENDERER"); + const char *glLibName = getenv("POJAV_RENDERER"); + if (glLibName) { + if (!strcmp(glLibName, "auto")) { + // workaround only applies to 1.20.2+ + glLibName = RENDERER_NAME_MTL_ANGLE; + } + margv[++margc] = [NSString stringWithFormat:@"-Dorg.lwjgl.opengl.libname=%s", glLibName].UTF8String; } - margv[++margc] = [NSString stringWithFormat:@"-Dorg.lwjgl.opengl.libname=%s", glLibName].UTF8String; NSString *librariesPath = [NSString stringWithFormat:@"%s/libs", getenv("BUNDLE_PATH")]; if(getPrefBool(@"general.cosmetica")) {