X-Git-Url: http://git.nikiroo.be/?p=fanfix.git;a=blobdiff_plain;f=src%2Fbe%2Fnikiroo%2Ffanfix%2FInstance.java;h=33c65e003aeddc21a7f70e36b342b123a9e6f5ac;hp=aacf0c50860064a0f980077ad641ab36aa5d837d;hb=2284842831ea46e89b97dd22b6e294caad361f30;hpb=c330535057e64f195ee0d6e3955f3a65731e39a2

diff --git a/src/be/nikiroo/fanfix/Instance.java b/src/be/nikiroo/fanfix/Instance.java
index aacf0c5..33c65e0 100644
--- a/src/be/nikiroo/fanfix/Instance.java
+++ b/src/be/nikiroo/fanfix/Instance.java
@@ -30,11 +30,15 @@ public class Instance {
 		// Most of the rest is dependent upon this:
 		config = new ConfigBundle();
 
-		String configDir = System.getenv("CONFIG_DIR");
+		String configDir = System.getProperty("CONFIG_DIR");
+		if (configDir == null) {
+			configDir = System.getenv("CONFIG_DIR");
+		}
 		if (configDir == null) {
 			configDir = new File(System.getProperty("user.home"), ".fanfix")
 					.getPath();
 		}
+		
 		if (configDir != null) {
 			if (!new File(configDir).exists()) {
 				new File(configDir).mkdirs();