mirror/yacreader
1
0
Fork 0
mirror of https://github.com/YACReader/yacreader synced 2025-06-04 01:28:55 -04:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #387 from YACReader/develop

Browse Source 
9.13.1
This commit is contained in:
Luis Ángel San Martín 2023-07-16 13:38:21 +02:00 committed by GitHub
commit 214ae69c79
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 16 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
CHANGELOG.md
View File

@ -2,6 +2,11 @@
Version counting is based on semantic versioning (Major.Feature.Patch) Version counting is based on semantic versioning (Major.Feature.Patch)
## 9.13.1
### YACReaderLibrary
* Fix crash when dropping comics in sublists
## 9.13 ## 9.13
### YACReaderLibrary ### YACReaderLibrary

5
YACReaderLibrary/db/reading_list_model.cpp
View File

@ -218,8 +218,13 @@ bool ReadingListModel::canDropMimeData(const QMimeData *data, Qt::DropAction act
QByteArray rawData = data->data(YACReader::YACReaderLibrarSubReadingListMimeDataFormat); QByteArray rawData = data->data(YACReader::YACReaderLibrarSubReadingListMimeDataFormat);
QDataStream in(&rawData, QIODevice::ReadOnly); QDataStream in(&rawData, QIODevice::ReadOnly);
in >> sublistsRows; // deserialize the list of indentifiers in >> sublistsRows; // deserialize the list of indentifiers
if (sublistsRows.isEmpty())
return false;
if (parent.row() != sublistsRows.at(0).second) if (parent.row() != sublistsRows.at(0).second)
return false; return false;
return data->formats().contains(YACReader::YACReaderLibrarSubReadingListMimeDataFormat); return data->formats().contains(YACReader::YACReaderLibrarSubReadingListMimeDataFormat);
} }
} }

12
YACReaderLibrary/db_helper.cpp
View File

@ -1363,10 +1363,10 @@ void DBHelper::insertComicsInFavorites(const QList<ComicDB> &comicsList, QSqlDat
void DBHelper::insertComicsInLabel(const QList<ComicDB> &comicsList, qulonglong labelId, QSqlDatabase &db) void DBHelper::insertComicsInLabel(const QList<ComicDB> &comicsList, qulonglong labelId, QSqlDatabase &db)
{ {
QSqlQuery getNumComicsInFavoritesQuery(QString("SELECT count(*) FROM comic_label WHERE label_id = %1;").arg(labelId), db); QSqlQuery getNumComics(QString("SELECT count(*) FROM comic_label WHERE label_id = %1;").arg(labelId), db);
getNumComicsInFavoritesQuery.next(); getNumComics.next();
int numComics = getNumComicsInFavoritesQuery.value(0).toInt(); int numComics = getNumComics.value(0).toInt();
db.transaction(); db.transaction();
@ -1388,10 +1388,10 @@ void DBHelper::insertComicsInLabel(const QList<ComicDB> &comicsList, qulonglong
void DBHelper::insertComicsInReadingList(const QList<ComicDB> &comicsList, qulonglong readingListId, QSqlDatabase &db) void DBHelper::insertComicsInReadingList(const QList<ComicDB> &comicsList, qulonglong readingListId, QSqlDatabase &db)
{ {
QSqlQuery getNumComicsInFavoritesQuery("SELECT count(*) FROM comic_reading_list;", db); QSqlQuery getNumComics("SELECT count(*) FROM comic_reading_list;", db);
getNumComicsInFavoritesQuery.next(); getNumComics.next();
int numComics = getNumComicsInFavoritesQuery.value(0).toInt(); int numComics = getNumComics.value(0).toInt();
db.transaction(); db.transaction();