From f6e4218592b602716035a903399c9da07c7bbe96 Mon Sep 17 00:00:00 2001 From: ShirosakiMio <852468399@qq.com> Date: Mon, 31 Jul 2023 17:32:32 +0800 Subject: [PATCH] change log file path --- .../src/main/java/com/tungsten/fclauncher/FCLauncher.java | 3 ++- .../main/java/com/tungsten/fclauncher/bridge/FCLBridge.java | 5 +++++ 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/FCLauncher/src/main/java/com/tungsten/fclauncher/FCLauncher.java b/FCLauncher/src/main/java/com/tungsten/fclauncher/FCLauncher.java index 14f65c50..bcb52e6c 100644 --- a/FCLauncher/src/main/java/com/tungsten/fclauncher/FCLauncher.java +++ b/FCLauncher/src/main/java/com/tungsten/fclauncher/FCLauncher.java @@ -9,6 +9,7 @@ import android.util.ArrayMap; import com.jaredrummler.android.device.DeviceName; import com.tungsten.fclauncher.bridge.FCLBridge; import com.tungsten.fclauncher.utils.Architecture; +import com.tungsten.fclauncher.utils.FCLPath; import java.io.BufferedReader; import java.io.File; @@ -236,7 +237,7 @@ public class FCLauncher { // initialize FCLBridge FCLBridge bridge = new FCLBridge(); - bridge.setLogPath(config.getLogDir() + "/latest_game.log"); + bridge.setLogPath(new File(FCLPath.SHARED_COMMON_DIR).getParent() + "/latest_game.log"); Thread gameThread = new Thread(() -> { try { logStartInfo(bridge, "Minecraft"); diff --git a/FCLauncher/src/main/java/com/tungsten/fclauncher/bridge/FCLBridge.java b/FCLauncher/src/main/java/com/tungsten/fclauncher/bridge/FCLBridge.java index 2470d702..b6624dd4 100644 --- a/FCLauncher/src/main/java/com/tungsten/fclauncher/bridge/FCLBridge.java +++ b/FCLauncher/src/main/java/com/tungsten/fclauncher/bridge/FCLBridge.java @@ -113,6 +113,7 @@ public class FCLBridge implements Serializable { this.callback = callback; this.surface = surface; fclLogThread = new Thread(() -> { + receiveLog("invoke redirectStdio"); int errorCode = redirectStdio(getLogPath()); if (errorCode != 0) { receiveLog("Can't exec redirectStdio! Error code: " + errorCode); @@ -254,12 +255,16 @@ public class FCLBridge implements Serializable { } public void setLogPipeReady() { + receiveLog("invoke setLogPipeReady"); handler.post(() -> { + receiveLog("invoke setFCLBridge"); setFCLBridge(this); // set graphic output and event pipe if (surface != null) { + receiveLog("invoke setFCLNativeWindow"); setFCLNativeWindow(surface); } + receiveLog("invoke setEventPipe"); setEventPipe(); // start