From a06f1ac995c805d6cd6952429f3051ffd5e11ccc Mon Sep 17 00:00:00 2001 From: Patrick Gaskin Date: Wed, 12 Aug 2020 16:57:02 -0400 Subject: [PATCH] NickelSeries: Added support for series without an index --- NickelSeries/metadata.cc | 2 +- NickelSeries/nickelseries.cc | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/NickelSeries/metadata.cc b/NickelSeries/metadata.cc index e034c92..6e8d720 100644 --- a/NickelSeries/metadata.cc +++ b/NickelSeries/metadata.cc @@ -200,7 +200,7 @@ void NSMetadata::init(QXmlStreamReader &r) { } for (QString source : this->series.keys()) - if (this->series[source].first.isEmpty() || this->series[source].second.isEmpty()) + if (this->series[source].first.isEmpty()) this->series.remove(source); for (QString source : this->subtitle.keys()) diff --git a/NickelSeries/nickelseries.cc b/NickelSeries/nickelseries.cc index 6ff4642..fa4b6cb 100644 --- a/NickelSeries/nickelseries.cc +++ b/NickelSeries/nickelseries.cc @@ -87,7 +87,9 @@ static void ns_update_series(Volume *v, QString const& filename) { double d = QVariant(index).toDouble(&ok); if (ok) { nh_log("... simplified series index '%s' to '%s'", qPrintable(index), qPrintable(QString::number(d))); - index = QString::number(d); + index = d + ? QString::number(d) + : QString(); } nh_log("... Volume::setSeriesName('%s')", qPrintable(series));