From: Niki Roo <niki@nikiroo.be>
Date: Sat, 13 Apr 2019 11:33:46 +0000 (+0200)
Subject: Merge branch 'master' into search
X-Git-Url: http://git.nikiroo.be/?p=fanfix.git;a=commitdiff_plain;h=e39e560faae7c7bf3cf6fb098be5c4b209ac29e3;hp=8b153400ae5ab24891446be1b3423ea17e71b49c

Merge branch 'master' into search
---

diff --git a/changelog-fr.md b/changelog-fr.md
index 667171e..3d2d822 100644
--- a/changelog-fr.md
+++ b/changelog-fr.md
@@ -5,6 +5,7 @@
 - new: recherche d'histoires (Fanfiction.net)
 - new: support d'un proxy
 - fix: support des CBZ contenant du texte
+- fix: correction de DEBUG=0
 - gui: correction pour le focus 
 
 # Version 2.0.2
diff --git a/changelog.md b/changelog.md
index 4acda01..cc872ae 100644
--- a/changelog.md
+++ b/changelog.md
@@ -5,6 +5,7 @@
 - new: story search (Fanfiction.net)
 - new: proxy support
 - fix: support hybrid CBZ (with text)
+- fix: fix DEBUG=0
 - gui: focus fix
 
 # Version 2.0.2
diff --git a/src/be/nikiroo/fanfix/Instance.java b/src/be/nikiroo/fanfix/Instance.java
index a6f6fb7..c547a2b 100644
--- a/src/be/nikiroo/fanfix/Instance.java
+++ b/src/be/nikiroo/fanfix/Instance.java
@@ -43,7 +43,9 @@ public class Instance {
 
 	static {
 		// Before we can configure it:
-		tracer = new TraceHandler(true, checkEnv("DEBUG"), checkEnv("DEBUG"));
+		Boolean debug = checkEnv("DEBUG");
+		boolean trace = debug != null && debug;
+		tracer = new TraceHandler(true, trace, trace);
 
 		// config dir:
 		configDir = getConfigDir();
@@ -53,19 +55,14 @@ public class Instance {
 
 		// Most of the rest is dependent upon this:
 		createConfigs(configDir, false);
-		
+
 		// Proxy support
 		Proxy.use(Instance.getConfig().getString(Config.USE_PROXY));
 
 		// update tracer:
-		boolean debug = Instance.getConfig()
-				.getBoolean(Config.DEBUG_ERR, false);
-		boolean trace = Instance.getConfig().getBoolean(Config.DEBUG_TRACE,
-				false);
-
-		if (checkEnv("DEBUG")) {
-			debug = true;
-			trace = true;
+		if (debug == null) {
+			debug = Instance.getConfig().getBoolean(Config.DEBUG_ERR, false);
+			trace = Instance.getConfig().getBoolean(Config.DEBUG_TRACE, false);
 		}
 
 		tracer = new TraceHandler(true, debug, trace);
@@ -408,7 +405,8 @@ public class Instance {
 			trans.deleteFile(configDir);
 		}
 
-		if (checkEnv("NOUTF")) {
+		Boolean noutf = checkEnv("NOUTF");
+		if (noutf != null && noutf) {
 			trans.setUnicode(false);
 			transGui.setUnicode(false);
 		}
@@ -571,7 +569,7 @@ public class Instance {
 	 * 
 	 * @return TRUE if it is
 	 */
-	private static boolean checkEnv(String key) {
+	private static Boolean checkEnv(String key) {
 		String value = System.getenv(key);
 		if (value != null) {
 			value = value.trim().toLowerCase();
@@ -580,8 +578,10 @@ public class Instance {
 					|| "y".equals(value)) {
 				return true;
 			}
+
+			return false;
 		}
 
-		return false;
+		return null;
 	}
 }