Merge pull request #14586 from glassez/varhash

Don't cause QHash relayout while using reference to its node
This commit is contained in:
Vladimir Golovnev 2021-03-24 11:37:43 +03:00 committed by GitHub
commit 9f386afe9c
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23

View file

@ -823,15 +823,16 @@ void Parser::addArticle(QVariantHash article)
{ {
QVariant &torrentURL = article[Article::KeyTorrentURL]; QVariant &torrentURL = article[Article::KeyTorrentURL];
if (torrentURL.toString().isEmpty()) if (torrentURL.toString().isEmpty())
torrentURL = article[Article::KeyLink]; torrentURL = article.value(Article::KeyLink);
// If item does not have an ID, fall back to some other identifier. // If item does not have an ID, fall back to some other identifier.
QVariant &localId = article[Article::KeyId]; QVariant &localId = article[Article::KeyId];
if (localId.toString().isEmpty()) if (localId.toString().isEmpty())
{
localId = article.value(Article::KeyTorrentURL); localId = article.value(Article::KeyTorrentURL);
if (localId.toString().isEmpty()) if (localId.toString().isEmpty())
{
localId = article.value(Article::KeyTitle); localId = article.value(Article::KeyTitle);
if (localId.toString().isEmpty()) if (localId.toString().isEmpty())
{ {
// The article could not be uniquely identified // The article could not be uniquely identified
@ -839,6 +840,8 @@ void Parser::addArticle(QVariantHash article)
// Just ignore it. // Just ignore it.
return; return;
} }
}
}
if (m_articleIDs.contains(localId.toString())) if (m_articleIDs.contains(localId.toString()))
{ {