From acd5caa9fe0826595b1aa1e0091d5c21825a3563 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Luis=20=C3=81ngel=20San=20Mart=C3=ADn?= Date: Mon, 10 Jul 2023 08:38:03 +0200 Subject: [PATCH 1/3] Rename variable to match logic --- YACReaderLibrary/db_helper.cpp | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/YACReaderLibrary/db_helper.cpp b/YACReaderLibrary/db_helper.cpp index 9709ce1b..b315a446 100644 --- a/YACReaderLibrary/db_helper.cpp +++ b/YACReaderLibrary/db_helper.cpp @@ -1363,10 +1363,10 @@ void DBHelper::insertComicsInFavorites(const QList &comicsList, QSqlDat void DBHelper::insertComicsInLabel(const QList &comicsList, qulonglong labelId, QSqlDatabase &db) { - QSqlQuery getNumComicsInFavoritesQuery(QString("SELECT count(*) FROM comic_label WHERE label_id = %1;").arg(labelId), db); - getNumComicsInFavoritesQuery.next(); + QSqlQuery getNumComics(QString("SELECT count(*) FROM comic_label WHERE label_id = %1;").arg(labelId), db); + getNumComics.next(); - int numComics = getNumComicsInFavoritesQuery.value(0).toInt(); + int numComics = getNumComics.value(0).toInt(); db.transaction(); @@ -1388,10 +1388,10 @@ void DBHelper::insertComicsInLabel(const QList &comicsList, qulonglong void DBHelper::insertComicsInReadingList(const QList &comicsList, qulonglong readingListId, QSqlDatabase &db) { - QSqlQuery getNumComicsInFavoritesQuery("SELECT count(*) FROM comic_reading_list;", db); - getNumComicsInFavoritesQuery.next(); + QSqlQuery getNumComics("SELECT count(*) FROM comic_reading_list;", db); + getNumComics.next(); - int numComics = getNumComicsInFavoritesQuery.value(0).toInt(); + int numComics = getNumComics.value(0).toInt(); db.transaction(); From 5d10a03044fbf06894be4edd56049baf31f15a8f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Luis=20=C3=81ngel=20San=20Mart=C3=ADn?= Date: Mon, 10 Jul 2023 08:39:31 +0200 Subject: [PATCH 2/3] Fix crash when dropping comics in sublists --- CHANGELOG.md | 5 +++++ YACReaderLibrary/db/reading_list_model.cpp | 5 +++++ 2 files changed, 10 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 52cfdd0e..d44be625 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,11 @@ Version counting is based on semantic versioning (Major.Feature.Patch) +## WIP + +### YACReaderLibrary +* Fix crash when dropping comics in sublists + ## 9.13 ### YACReaderLibrary diff --git a/YACReaderLibrary/db/reading_list_model.cpp b/YACReaderLibrary/db/reading_list_model.cpp index 8352ca09..856fa87b 100644 --- a/YACReaderLibrary/db/reading_list_model.cpp +++ b/YACReaderLibrary/db/reading_list_model.cpp @@ -218,8 +218,13 @@ bool ReadingListModel::canDropMimeData(const QMimeData *data, Qt::DropAction act QByteArray rawData = data->data(YACReader::YACReaderLibrarSubReadingListMimeDataFormat); QDataStream in(&rawData, QIODevice::ReadOnly); in >> sublistsRows; // deserialize the list of indentifiers + + if (sublistsRows.isEmpty()) + return false; + if (parent.row() != sublistsRows.at(0).second) return false; + return data->formats().contains(YACReader::YACReaderLibrarSubReadingListMimeDataFormat); } } From 02342ab41ee099dd4315243c0594cccd194ddf13 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Luis=20=C3=81ngel=20San=20Mart=C3=ADn?= Date: Sun, 16 Jul 2023 11:27:53 +0200 Subject: [PATCH 3/3] Update CHANGELOG for 9.13.1 --- CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index d44be625..c29dedac 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,7 +2,7 @@ Version counting is based on semantic versioning (Major.Feature.Patch) -## WIP +## 9.13.1 ### YACReaderLibrary * Fix crash when dropping comics in sublists