d4708/qBittorrent
1
0
Fork 0
mirror of https://github.com/d47081/qBittorrent.git synced 2025-01-28 15:34:16 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #6744 from glassez/fix-rss

Browse Source 
Fix crash when delete last RSS feed. Closes #6742
This commit is contained in:
Vladimir Golovnev 2017-05-05 19:09:06 +03:00 committed by GitHub
commit 706097ddda
3 changed files with 11 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/gui/rss/articlelistwidget.cpp
View File

@ -38,7 +38,7 @@ ArticleListWidget::ArticleListWidget(QWidget *parent)
{ {
setContextMenuPolicy(Qt::CustomContextMenu); setContextMenuPolicy(Qt::CustomContextMenu);
setSelectionMode(QAbstractItemView::ExtendedSelection); setSelectionMode(QAbstractItemView::ExtendedSelection);
checkInvariant(); checkInvariant();
} }
@ -93,14 +93,9 @@ void ArticleListWidget::handleArticleAdded(RSS::Article *rssArticle)
void ArticleListWidget::handleArticleRead(RSS::Article *rssArticle) void ArticleListWidget::handleArticleRead(RSS::Article *rssArticle)
{ {
if (m_unreadOnly) { auto item = mapRSSArticle(rssArticle);
delete m_rssArticleToListItemMapping.take(rssArticle); item->setData(Qt::ForegroundRole, QColor("grey"));
} item->setData(Qt::DecorationRole, QIcon(":/icons/sphere.png"));
else {
auto item = mapRSSArticle(rssArticle);
item->setData(Qt::ForegroundRole, QColor("grey"));
item->setData(Qt::DecorationRole, QIcon(":/icons/sphere.png"));
}
checkInvariant(); checkInvariant();
} }

7
src/gui/rss/feedlistwidget.cpp
View File

@ -138,6 +138,11 @@ void FeedListWidget::handleItemPathChanged(RSS::Item *rssItem)
void FeedListWidget::handleItemAboutToBeRemoved(RSS::Item *rssItem) void FeedListWidget::handleItemAboutToBeRemoved(RSS::Item *rssItem)
{ {
delete m_rssToTreeItemMapping.take(rssItem); delete m_rssToTreeItemMapping.take(rssItem);
// RSS Item is still valid in this slot so if it is the last
// item we should prevent Unread list populating
if (m_rssToTreeItemMapping.size() == 1)
setCurrentItem(nullptr);
} }
QTreeWidgetItem *FeedListWidget::stickyUnreadItem() const QTreeWidgetItem *FeedListWidget::stickyUnreadItem() const
@ -164,6 +169,8 @@ QList<QTreeWidgetItem *> FeedListWidget::getAllOpenedFolders(QTreeWidgetItem *pa
RSS::Item *FeedListWidget::getRSSItem(QTreeWidgetItem *item) const RSS::Item *FeedListWidget::getRSSItem(QTreeWidgetItem *item) const
{ {
if (!item) return nullptr;
return reinterpret_cast<RSS::Item *>(item->data(0, Qt::UserRole).value<quintptr>()); return reinterpret_cast<RSS::Item *>(item->data(0, Qt::UserRole).value<quintptr>());
} }

5
src/gui/rss/rsswidget.cpp
View File

@ -416,11 +416,6 @@ void RSSWidget::copySelectedFeedsURL()
void RSSWidget::handleCurrentFeedItemChanged(QTreeWidgetItem *currentItem) void RSSWidget::handleCurrentFeedItemChanged(QTreeWidgetItem *currentItem)
{ {
if (!currentItem) {
m_articleListWidget->clear();
return;
}
m_articleListWidget->setRSSItem(m_feedListWidget->getRSSItem(currentItem) m_articleListWidget->setRSSItem(m_feedListWidget->getRSSItem(currentItem)
, (currentItem == m_feedListWidget->stickyUnreadItem())); , (currentItem == m_feedListWidget->stickyUnreadItem()));
} }