X-Git-Url: http://git.nikiroo.be/?a=blobdiff_plain;f=src%2Fbe%2Fnikiroo%2Ffanfix%2Fsupported%2FCbz.java;h=3682afe520706748c36e1132cf56770d02c919bb;hb=c289a297c0e819c9c944732e52e30a35db7a1796;hp=dfc1bbb86e90ea4705ca967bd319904484ac49f3;hpb=67837328c9ded45b23691e2a3ebdb29c75f157f2;p=fanfix.git

diff --git a/src/be/nikiroo/fanfix/supported/Cbz.java b/src/be/nikiroo/fanfix/supported/Cbz.java
index dfc1bbb..3682afe 100644
--- a/src/be/nikiroo/fanfix/supported/Cbz.java
+++ b/src/be/nikiroo/fanfix/supported/Cbz.java
@@ -1,7 +1,6 @@
 package be.nikiroo.fanfix.supported;
 
 import java.io.File;
-import java.io.FileInputStream;
 import java.io.IOException;
 import java.io.InputStream;
 import java.net.URL;
@@ -21,8 +20,8 @@ import be.nikiroo.fanfix.data.Paragraph.ParagraphType;
 import be.nikiroo.fanfix.data.Story;
 import be.nikiroo.utils.IOUtils;
 import be.nikiroo.utils.Image;
-import be.nikiroo.utils.streams.MarkableFileInputStream;
 import be.nikiroo.utils.Progress;
+import be.nikiroo.utils.streams.MarkableFileInputStream;
 
 /**
  * Support class for CBZ files (works better with CBZ created with this program,
@@ -132,25 +131,27 @@ class Cbz extends Epub {
 			story.setChapters(new ArrayList<Chapter>());
 
 			// Check if we can find non-images chapters, for hybrid-cbz support
-			for (Chapter chap : origStory) {
-				Boolean isImages = null;
-				for (Paragraph para : chap) {
-					ParagraphType t = para.getType();
-					if (isImages == null && !t.isText(true)) {
-						isImages = true;
-					}
-					if (t.isText(false)) {
-						String line = para.getContent();
-						// Images are saved in text mode as "[image-link]"
-						if (!(line.startsWith("[") && line.endsWith("]"))) {
-							isImages = false;
+			if (origStory != null) {
+				for (Chapter chap : origStory) {
+					Boolean isImages = null;
+					for (Paragraph para : chap) {
+						ParagraphType t = para.getType();
+						if (isImages == null && !t.isText(true)) {
+							isImages = true;
+						}
+						if (t.isText(false)) {
+							String line = para.getContent();
+							// Images are saved in text mode as "[image-link]"
+							if (!(line.startsWith("[") && line.endsWith("]"))) {
+								isImages = false;
+							}
 						}
 					}
-				}
 
-				if (isImages != null && !isImages) {
-					story.getChapters().add(chap);
-					chap.setNumber(story.getChapters().size());
+					if (isImages != null && !isImages) {
+						story.getChapters().add(chap);
+						chap.setNumber(story.getChapters().size());
+					}
 				}
 			}