lan/HMCL
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixed missed encoding in Log4jHandler

Browse Source
This commit is contained in:
huangyuhui
2018-02-27 11:13:07 +08:00
parent 3067d323de
commit 655e5ca7e0
2 changed files with 5 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
HMCL/src/main/java/org/jackhuang/hmcl/ui/Decorator.java
View File

@@ -494,11 +494,8 @@ public final class Decorator extends StackPane implements TaskExecutorDialogWiza
FXUtils.setOverflowHidden((Region) content, true); FXUtils.setOverflowHidden((Region) content, true);
} }
if (content instanceof Refreshable) refreshNavButton.setVisible(content instanceof Refreshable);
refreshNavButton.setVisible(true); backNavButton.setVisible(content != mainPage);
if (content != mainPage)
backNavButton.setVisible(true);
String prefix = category == null ? "" : category + " - "; String prefix = category == null ? "" : category + " - ";

5
HMCLCore/src/main/java/org/jackhuang/hmcl/launch/Log4jHandler.java
View File

@@ -71,7 +71,8 @@ final class Log4jHandler extends Thread {
setName("log4j-handler"); setName("log4j-handler");
try { try {
reader.parse(new InputSource(inputStream)); InputSource inputSource = new InputSource(inputStream);
reader.parse(inputSource);
} catch (InterruptedIOException e) { } catch (InterruptedIOException e) {
// Game has been interrupted. // Game has been interrupted.
interrupted.set(true); interrupted.set(true);
@@ -108,7 +109,7 @@ final class Log4jHandler extends Thread {
if (broken) if (broken)
System.out.println(line); System.out.println(line);
byte[] bytes = (line + OperatingSystem.LINE_SEPARATOR).getBytes(Charsets.UTF_8); byte[] bytes = (line + OperatingSystem.LINE_SEPARATOR).getBytes(Constants.SYSTEM_CHARSET);
outputStream.write(bytes); outputStream.write(bytes);
outputStream.flush(); outputStream.flush();
} catch (IOException e) { } catch (IOException e) {