From 568f52c54167ea453fc071cf574100154ec44b0b Mon Sep 17 00:00:00 2001 From: Duy Tran Khanh <40482367+khanhduytran0@users.noreply.github.com> Date: Tue, 7 Sep 2021 15:13:59 +0700 Subject: [PATCH] Fixes a NullPointerException java.lang.NullPointerException: Attempt to invoke virtual method 'boolean java.lang.String.equals(java.lang.Object)' on a null object reference at net.kdt.pojavlaunch.utils.JREUtils.setJavaEnvironment(JREUtils.java:229) at net.kdt.pojavlaunch.utils.JREUtils.launchJavaVM(JREUtils.java:284) at net.kdt.pojavlaunch.JavaGUILauncherActivity.launchJavaRuntime(JavaGUILauncherActivity.java:309) at net.kdt.pojavlaunch.JavaGUILauncherActivity.doCustomInstall(JavaGUILauncherActivity.java:281) at net.kdt.pojavlaunch.JavaGUILauncherActivity.access$700(JavaGUILauncherActivity.java:20) at net.kdt.pojavlaunch.JavaGUILauncherActivity$5.run(JavaGUILauncherActivity.java:192) at java.lang.Thread.run(Thread.java:784) --- .../src/main/java/net/kdt/pojavlaunch/utils/JREUtils.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/utils/JREUtils.java b/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/utils/JREUtils.java index 6a6a008b5..3dfcfc7dc 100644 --- a/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/utils/JREUtils.java +++ b/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/utils/JREUtils.java @@ -225,8 +225,8 @@ public class JREUtils { envMap.put("REGAL_GL_VERSION", "4.5"); if(LOCAL_RENDERER != null) { envMap.put("POJAV_RENDERER", LOCAL_RENDERER); + if(LOCAL_RENDERER.equals("opengles3_desktopgl_angle_vulkan")) envMap.put("POJAVEXEC_EGL","libEGL_angle.so"); // use ANGLE egl } - if(LOCAL_RENDERER.equals("opengles3_desktopgl_angle_vulkan")) envMap.put("POJAVEXEC_EGL","libEGL_angle.so"); // use ANGLE egl envMap.put("AWTSTUB_WIDTH", Integer.toString(CallbackBridge.windowWidth > 0 ? CallbackBridge.windowWidth : CallbackBridge.physicalWidth)); envMap.put("AWTSTUB_HEIGHT", Integer.toString(CallbackBridge.windowHeight > 0 ? CallbackBridge.windowHeight : CallbackBridge.physicalHeight));