Merged luisangelsm/yacreader/develop into develop

This commit is contained in:
Felix Kauselmann
2017-12-11 11:00:52 +01:00
parent 3f1b1f620b
commit 1c232b0549
8 changed files with 16 additions and 7 deletions

View File

@ -387,7 +387,7 @@ void DBHelper::updateProgress(qulonglong libraryId, const ComicInfo &comicInfo)
ComicDB comic = DBHelper::loadComic(comicInfo.id,db);
comic.info.currentPage = comicInfo.currentPage;
comic.info.hasBeenOpened = true;
comic.info.read = comicInfo.read || comicInfo.currentPage == comicInfo.numPages;
comic.info.read = comic.info.read || comic.info.currentPage == comic.info.numPages;
DBHelper::updateReadingRemoteProgress(comic.info,db);
@ -875,7 +875,7 @@ QList<ComicDB> DBHelper::getSortedComicsFromParent(qulonglong parentId, QSqlData
{
if(c1.info.number.isNull() && c2.info.number.isNull())
{
return naturalSortLessThanCI(c1.info.title.toString(), c2.info.title.toString());
return naturalSortLessThanCI(c1.name, c2.name);
}
else
{