From 655e5ca7e030509e6a81135242a9a3c3452f70b1 Mon Sep 17 00:00:00 2001
From: huangyuhui <huanghongxun2008@126.com>
Date: Tue, 27 Feb 2018 11:13:07 +0800
Subject: [PATCH] Fixed missed encoding in Log4jHandler

---
 HMCL/src/main/java/org/jackhuang/hmcl/ui/Decorator.java    | 7 ++-----
 .../main/java/org/jackhuang/hmcl/launch/Log4jHandler.java  | 5 +++--
 2 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/HMCL/src/main/java/org/jackhuang/hmcl/ui/Decorator.java b/HMCL/src/main/java/org/jackhuang/hmcl/ui/Decorator.java
index 530d36377..ea4f30d5a 100644
--- a/HMCL/src/main/java/org/jackhuang/hmcl/ui/Decorator.java
+++ b/HMCL/src/main/java/org/jackhuang/hmcl/ui/Decorator.java
@@ -494,11 +494,8 @@ public final class Decorator extends StackPane implements TaskExecutorDialogWiza
             FXUtils.setOverflowHidden((Region) content, true);
         }
 
-        if (content instanceof Refreshable)
-            refreshNavButton.setVisible(true);
-
-        if (content != mainPage)
-            backNavButton.setVisible(true);
+        refreshNavButton.setVisible(content instanceof Refreshable);
+        backNavButton.setVisible(content != mainPage);
 
         String prefix = category == null ? "" : category + " - ";
 
diff --git a/HMCLCore/src/main/java/org/jackhuang/hmcl/launch/Log4jHandler.java b/HMCLCore/src/main/java/org/jackhuang/hmcl/launch/Log4jHandler.java
index 4fb444f43..e4df98328 100644
--- a/HMCLCore/src/main/java/org/jackhuang/hmcl/launch/Log4jHandler.java
+++ b/HMCLCore/src/main/java/org/jackhuang/hmcl/launch/Log4jHandler.java
@@ -71,7 +71,8 @@ final class Log4jHandler extends Thread {
         setName("log4j-handler");
 
         try {
-            reader.parse(new InputSource(inputStream));
+            InputSource inputSource = new InputSource(inputStream);
+            reader.parse(inputSource);
         } catch (InterruptedIOException e) {
             // Game has been interrupted.
             interrupted.set(true);
@@ -108,7 +109,7 @@ final class Log4jHandler extends Thread {
                 if (broken)
                     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.flush();
             } catch (IOException e) {