From: Niki Roo <niki@nikiroo.be>
Date: Tue, 5 May 2020 20:40:52 +0000 (+0200)
Subject: Merge branch 'subtree'
X-Git-Url: http://git.nikiroo.be/?p=fanfix.git;a=commitdiff_plain;h=509c7ce173c9d2f607cca22799d66ddb24a9aa29;hp=-c

Merge branch 'subtree'
---

509c7ce173c9d2f607cca22799d66ddb24a9aa29
diff --combined src/be/nikiroo/fanfix/Main.java
index b49cf0f,2e8b6d1..2e8b6d1
--- a/src/be/nikiroo/fanfix/Main.java
+++ b/src/be/nikiroo/fanfix/Main.java
@@@ -687,10 -687,13 +687,13 @@@ public class Main 
  	}
  
  	/**
- 	 * Will check if updates are available.
+ 	 * Will check if updates are available, synchronously.
  	 * <p>
  	 * For this, it will simply forward the call to
  	 * {@link Main#checkUpdates(String)} with a value of "nikiroo/fanfix".
+ 	 * <p>
+ 	 * You may want to override it so you call the forward method with the right
+ 	 * parameters (or also if you want it to be asynchronous).
  	 * 
  	 * @return the newer version information or NULL if nothing new
  	 */
diff --combined src/be/nikiroo/fanfix/VersionCheck.java
index fc631b0,8b2a343..8b2a343
--- a/src/be/nikiroo/fanfix/VersionCheck.java
+++ b/src/be/nikiroo/fanfix/VersionCheck.java
@@@ -127,7 -127,8 +127,8 @@@ public class VersionCheck 
  				InputStream in = null;
  				for (String url : new String[] { urlFrBE, urlFr, urlDefault }) {
  					try {
- 						in = Instance.getInstance().getCache().open(new URL(url), null, false);
+ 						in = Instance.getInstance().getCache().openNoCache(
+ 								new URL(url), null, null, null, null);
  						break;
  					} catch (IOException e) {
  					}
diff --combined src/be/nikiroo/fanfix/bundles/Config.java
index 587851a,3af83c1..3af83c1
--- a/src/be/nikiroo/fanfix/bundles/Config.java
+++ b/src/be/nikiroo/fanfix/bundles/Config.java
@@@ -16,7 -16,6 +16,6 @@@ public enum Config 
  	@Meta(description = "The language to use for in the program (example: en-GB, fr-BE...) or nothing for default system language (can be overwritten with the variable $LANG)",//
  	format = Format.LOCALE, list = { "en-GB", "fr-BE" })
  	LANG, //
- 
  	@Meta(description = "File format options",//
  	group = true)
  	FILE_FORMAT, //