From 31431b41a465a5ff7a4bfeb447bf136613286b93 Mon Sep 17 00:00:00 2001 From: khanhduytran0 Date: Thu, 19 Nov 2020 05:14:11 +0700 Subject: [PATCH] Fix x86 again --- .../java/net/kdt/pojavlaunch/utils/JREUtils.java | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/app/src/main/java/net/kdt/pojavlaunch/utils/JREUtils.java b/app/src/main/java/net/kdt/pojavlaunch/utils/JREUtils.java index b980f41cc..d736b46e8 100644 --- a/app/src/main/java/net/kdt/pojavlaunch/utils/JREUtils.java +++ b/app/src/main/java/net/kdt/pojavlaunch/utils/JREUtils.java @@ -186,7 +186,7 @@ public class JREUtils LD_LIBRARY_PATH = ldLibraryPath.toString(); } - public static void setJavaEnvironment(Context ctx, @Nullable ShellProcessOperation shell) throws Throwable { + public static void setJavaEnvironment(LoggableActivity ctx, @Nullable ShellProcessOperation shell) throws Throwable { Map envMap = new ArrayMap<>(); envMap.put("JAVA_HOME", Tools.homeJreDir); envMap.put("HOME", Tools.MAIN_PATH); @@ -217,10 +217,14 @@ public class JREUtils } for (Map.Entry env : envMap.entrySet()) { - if (shell == null) { - Os.setenv(env.getKey(), env.getValue(), true); - } else { - shell.writeToProcess("export " + env.getKey() + "=" + env.getValue()); + try { + if (shell == null) { + Os.setenv(env.getKey(), env.getValue(), true); + } else { + shell.writeToProcess("export " + env.getKey() + "=" + env.getValue()); + } + } catch (Throwable th) { + ctx.appendlnToLog(Log.getStackTraceString(th)); } }