> Fixed crash in release card for bleach release

src/Classes/ListModels/releaseserieslistmodel.cpp

@@ -30,12 +30,11 @@ void ReleaseSeriesListModel::refresh() noexcept
 
     beginResetModel();
 
-    m_releases->clear();
+    m_variantReleases.clear();
 
     if (m_releaseId > 0) {
-        auto releases = m_releases.get();
-
-        m_linkedSeries->fillReleaseSeries(releases, m_releaseId);
+        auto newSeries = m_linkedSeries->fillReleaseSeries(m_releaseId);
+        m_variantReleases.append(newSeries);
     }
 
     endResetModel();
@@ -47,27 +46,27 @@ int ReleaseSeriesListModel::rowCount(const QModelIndex &parent) const
 {
     if (parent.isValid()) return 0;
 
-    return m_releases->size();
+    return m_variantReleases.size();
 }
 
 QVariant ReleaseSeriesListModel::data(const QModelIndex &index, int role) const
 {
     if (!index.isValid()) return QVariant();
 
-    auto release = m_releases->at(index.row());
+    auto map = m_variantReleases.at(index.row());
 
     switch (role) {
         case IndexRole: {
-            return QVariant(release->id());
+            return map.value("id");
         }
         case TitleRole: {
-            return QVariant(release->title());
+            return map.value("title");
         }
         case PosterRole: {
-            return QVariant(release->poster());
+            return map.value("poster");
         }
         case IsSelected: {
-            return QVariant(release->id() == m_releaseId);
+            return QVariant(map.value("id").toInt() == m_releaseId);
         }
         case ReleaseNumber: {
             return QVariant(index.row() + 1);

src/Classes/ListModels/releaseserieslistmodel.h

@@ -40,6 +40,7 @@ class ReleaseSeriesListModel : public QAbstractListModel
         ReleaseNumber
     };
     QScopedPointer<QList<FullReleaseModel*>> m_releases { new QList<FullReleaseModel*>() };
+    QList<QVariantMap> m_variantReleases { QList<QVariantMap>() };
     ReleaseLinkedSeries* m_linkedSeries { nullptr };
     int m_releaseId { -1 };
 
@@ -58,7 +59,7 @@ class ReleaseSeriesListModel : public QAbstractListModel
     int releaseId() const noexcept { return m_releaseId; }
     void setReleaseId(int releaseId) noexcept;
 
-    bool isEmpty() const noexcept { return m_releases->isEmpty(); }
+    bool isEmpty() const noexcept { return m_variantReleases.isEmpty(); }
 
 signals:
     void releaseIdChanged();

src/Classes/Services/releaselinkedseries.cpp

@@ -245,8 +245,9 @@ int ReleaseLinkedSeries::getSortedOrder(int id) const noexcept
     return 0;
 }
 
-void ReleaseLinkedSeries::fillReleaseSeries(QList<FullReleaseModel *> *list, const int id) noexcept
+QList<QVariantMap> ReleaseLinkedSeries::fillReleaseSeries(const int id) noexcept
 {
+    QList<QVariantMap> result;
     auto iterator = std::find_if(
         m_series.cbegin(),
         m_series.cend(),
@@ -255,22 +256,28 @@ void ReleaseLinkedSeries::fillReleaseSeries(QList<FullReleaseModel *> *list, con
         }
     );
 
-    if (iterator == m_series.cend()) return;
+    if (iterator == m_series.cend()) return result;
 
     auto item = *iterator;
     auto idsCollection = item->releaseIds();
-
-    for (auto i = 0; i < idsCollection->count(); i++) {
-        list->append(nullptr);
+    QMap<int, FullReleaseModel*> releaseMap;
+    foreach(auto release, *m_releases) {
+        releaseMap.insert(release->id(), release);
     }
 
-    foreach (auto release, *m_releases) {
-        auto releaseId = release->id();
-        if (idsCollection->contains(releaseId)) {
-            auto releaseIndex = idsCollection->indexOf(releaseId);
-            (*list)[releaseIndex] = release;
-        }
+    foreach (auto releaseSeries, *idsCollection) {
+        auto releaseId = releaseSeries.toInt();
+        if (!releaseMap.contains(releaseId)) continue;
+
+        auto release = releaseMap.value(releaseId);
+        QVariantMap map;
+        map["id"] = release->id();
+        map["title"] = release->title();
+        map["poster"] = release->poster();
+        result.append(map);
     }
+
+    return result;
 }
 
 int ReleaseLinkedSeries::getNextLinkedRelease(const int currentRelease)

src/Classes/Services/releaselinkedseries.h

@@ -103,7 +103,7 @@ class ReleaseLinkedSeries : public QAbstractListModel
     QList<QList<int>> getFullLinkedReleases() const noexcept;
     int getSortedOrder(int id) const noexcept;
 
-    void fillReleaseSeries(QList<FullReleaseModel*>* list, const int id) noexcept;
+    QList<QVariantMap> fillReleaseSeries(const int id) noexcept;
 
     Q_INVOKABLE int getNextLinkedRelease(const int currentRelease);
     Q_INVOKABLE void refreshSeries();

src/Classes/ViewModels/releasesviewmodel.cpp

@@ -1030,6 +1030,7 @@ void ReleasesViewModel::showReleaseCard(int id, bool needHandle) noexcept
 
     resetReleaseChanges(release->id());
 
+
     refreshOpenedReleaseCard();
 
     m_customGroups->setupReleaseId(id);