From 33f3f6396e1891e4c7f5c98059595a8e426a9dc8 Mon Sep 17 00:00:00 2001 From: Allen Winter <winter@kde.org> Date: Sat, 5 Sep 2015 11:23:08 -0400 Subject: [PATCH 11/74] feed.cpp - in findArticle() use QHash::values as intended no longer crashes for me when adding multiple feeds BUG: 255939 MERGE: safe to merge to modern releases --- akregator/src/feed.cpp | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/akregator/src/feed.cpp b/akregator/src/feed.cpp index 806afb39b4..fb92b2aad9 100644 --- a/akregator/src/feed.cpp +++ b/akregator/src/feed.cpp @@ -209,11 +209,7 @@ QVector<Akregator::Feed*> Akregator::Feed::feeds() Article Akregator::Feed::findArticle(const QString& guid) const { - Article a; - if ( !d->articles.isEmpty() ) { - a = d->articles[guid]; - } - return a; + return d->articles.value(guid); } QList<Article> Akregator::Feed::articles() @@ -885,5 +881,3 @@ void Akregator::Feed::enforceLimitArticleNumber() } } } - - -- 2.14.1