X-Git-Url: http://git.nikiroo.be/?a=blobdiff_plain;f=src%2Fbe%2Fnikiroo%2Ffanfix%2Foutput%2FHtml.java;h=da79466a40d9cc2fcf80872d77ef6e588398e732;hb=d66deb8d8b30cff6b54db352eef34a3508939f84;hp=e91c6f46bfe896b65024bb9f10d3d37abfc2732f;hpb=16a81ef7656c5c692fb831927e75edde25dd77a0;p=fanfix.git

diff --git a/src/be/nikiroo/fanfix/output/Html.java b/src/be/nikiroo/fanfix/output/Html.java
index e91c6f4..da79466 100644
--- a/src/be/nikiroo/fanfix/output/Html.java
+++ b/src/be/nikiroo/fanfix/output/Html.java
@@ -32,12 +32,6 @@ class Html extends BasicOutput {
 		target.mkdir();
 		dir = target;
 
-		// write a copy of the originals inside
-		InfoCover.writeInfo(dir, targetName, story.getMeta());
-		InfoCover.writeCover(dir, targetName, story.getMeta());
-		BasicOutput.getOutput(OutputType.TEXT, isWriteInfo(), isWriteCover())
-				.process(story, dir, targetNameOrig);
-
 		target = new File(targetDir, targetName + getDefaultExtension(true));
 
 		writer = new BufferedWriter(new OutputStreamWriter(
@@ -49,9 +43,14 @@ class Html extends BasicOutput {
 			writer = null;
 		}
 
+		// write a copy of the originals inside
+		InfoCover.writeInfo(dir, targetName, story.getMeta());
+		InfoCover.writeCover(dir, targetName, story.getMeta());
+		BasicOutput.getOutput(OutputType.TEXT, isWriteInfo(), isWriteCover())
+				.process(story, dir, targetNameOrig);
+
 		if (story.getMeta().getCover() != null) {
-			Instance.getCache().saveAsImage(story.getMeta().getCover(),
-					new File(dir, "cover"), true);
+			Instance.getInstance().getCache().saveAsImage(story.getMeta().getCover(), new File(dir, "cover"), true);
 		}
 
 		return target;
@@ -91,8 +90,8 @@ class Html extends BasicOutput {
 			author = meta.getAuthor();
 		}
 
-		String format = Instance.getConfig()
-				.getString(Config.IMAGE_FORMAT_COVER).toLowerCase();
+		String format = Instance.getInstance().getConfig()
+				.getString(Config.FILE_FORMAT_IMAGE_FORMAT_COVER).toLowerCase();
 
 		InputStream inStyle = getClass().getResourceAsStream("html.style.css");
 		if (inStyle == null) {