From d075b111ee3113a876c048126a80e0bd0fa1ed2e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Luis=20=C3=81ngel=20San=20Mart=C3=ADn?=
 <luisangelsm@gmail.com>
Date: Wed, 18 Dec 2013 23:16:53 +0100
Subject: [PATCH] Changed CRC errors management.

---
 YACReader/render.cpp |  1 +
 YACReader/render.h   |  1 +
 YACReader/viewer.cpp | 10 ++++++++--
 YACReader/viewer.h   |  1 +
 common/comic.cpp     |  2 +-
 common/comic.h       |  1 +
 6 files changed, 13 insertions(+), 3 deletions(-)

diff --git a/YACReader/render.cpp b/YACReader/render.cpp
index d6036001..81db733b 100644
--- a/YACReader/render.cpp
+++ b/YACReader/render.cpp
@@ -663,6 +663,7 @@ void Render::createComic(const QString & path)
 
 	connect(comic,SIGNAL(errorOpening()),this,SIGNAL(errorOpening()));
 	connect(comic,SIGNAL(errorOpening(QString)),this,SIGNAL(errorOpening(QString)));
+	connect(comic,SIGNAL(crcErrorFound(QString)),this,SIGNAL(crcError(QString)));
 	connect(comic,SIGNAL(errorOpening()),this,SLOT(reset()));
 	connect(comic,SIGNAL(imageLoaded(int)),this,SIGNAL(imageLoaded(int)));
 	connect(comic,SIGNAL(imageLoaded(int)),this,SLOT(pageRawDataReady(int)));
diff --git a/YACReader/render.h b/YACReader/render.h
index cb1c574a..423d7955 100644
--- a/YACReader/render.h
+++ b/YACReader/render.h
@@ -171,6 +171,7 @@ signals:
 	void numPages(unsigned int numPages);
 	void errorOpening();
 	void errorOpening(QString);
+	void crcError(QString);
 	void currentPageIsBookmark(bool);
 	void isLast();
 	void isCover();
diff --git a/YACReader/viewer.cpp b/YACReader/viewer.cpp
index 01ef3089..d90c0f95 100644
--- a/YACReader/viewer.cpp
+++ b/YACReader/viewer.cpp
@@ -159,6 +159,7 @@ void Viewer::createConnections()
 	connect(render,SIGNAL(errorOpening()),this,SLOT(resetContent()));
 	connect(render,SIGNAL(errorOpening()),this,SLOT(showMessageErrorOpening()));
 	connect(render,SIGNAL(errorOpening(QString)),this,SLOT(showMessageErrorOpening(QString)));
+	connect(render,SIGNAL(crcError(QString)),this,SLOT(processCRCError(QString)));
 	connect(render,SIGNAL(numPages(unsigned int)),goToFlow,SLOT(setNumSlides(unsigned int)));
 	connect(render,SIGNAL(numPages(unsigned int)),goToDialog,SLOT(setNumPages(unsigned int)));
 	//connect(render,SIGNAL(numPages(unsigned int)),this,SLOT(updateInformation()));
@@ -214,13 +215,18 @@ void Viewer::open(QString pathFile, const ComicDB & comic)
 void Viewer::showMessageErrorOpening()
 {
     QMessageBox::critical(this,tr("Not found"),tr("Comic not found"));
-    resetContent();
+	//resetContent(); --> not needed
 }
 
 void Viewer::showMessageErrorOpening(QString message)
 {
     QMessageBox::critical(this,tr("Error opening comic"),message);
-    resetContent();
+	resetContent();
+}
+
+void Viewer::processCRCError(QString message)
+{
+	QMessageBox::critical(this,tr("CRC Error"),message);
 }
 
 void Viewer::next()
diff --git a/YACReader/viewer.h b/YACReader/viewer.h
index 3b702321..4abd7ec7 100644
--- a/YACReader/viewer.h
+++ b/YACReader/viewer.h
@@ -81,6 +81,7 @@ virtual void mouseReleaseEvent ( QMouseEvent * event );
 		void updateConfig(QSettings * settings);
 		void showMessageErrorOpening();
 		void showMessageErrorOpening(QString);
+		void processCRCError(QString message);
 		void setBookmarks();
 		//deprecated
 		void updateImageOptions();
diff --git a/common/comic.cpp b/common/comic.cpp
index 8e787f4b..e651055e 100644
--- a/common/comic.cpp
+++ b/common/comic.cpp
@@ -299,7 +299,7 @@ void FileComic::fileExtracted(int index, const QByteArray & rawData)
 
 void FileComic::crcError(int index)
 {
-	emit errorOpening(tr("CRC error on page (%1): some of the pages will not be displayed correctly").arg(index));
+	emit crcErrorFound(tr("CRC error on page (%1): some of the pages will not be displayed correctly").arg(index+1));
 }
 
 //TODO: comprobar que si se produce uno de estos errores, la carga del cómic es irrecuperable
diff --git a/common/comic.h b/common/comic.h
index 2cb215e4..1ebd8ed2 100644
--- a/common/comic.h
+++ b/common/comic.h
@@ -90,6 +90,7 @@ class ComicDB;
 		void numPages(unsigned int numPages);
 		void errorOpening();
 		void errorOpening(QString);
+		void crcErrorFound(QString);
 		void isBookmark(bool);
 		void bookmarksUpdated();
 		void isCover();