From ec1a06d7c8be2fc8e367a1e38a2a4cadebcbe043 Mon Sep 17 00:00:00 2001 From: Christophe Dumez Date: Sun, 24 Jan 2010 16:50:48 +0000 Subject: [PATCH] BUGFIX: Fix race condition in RSS that could cause a crash on startup --- Changelog | 1 + src/feedList.h | 4 +++- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/Changelog b/Changelog index 483add4b2..95e2bdcf2 100644 --- a/Changelog +++ b/Changelog @@ -5,6 +5,7 @@ - BUGFIX: Fix overwrite check when renaming a folder in a torrent - BUGFIX: Force a recheck after renaming files to avoid overwriting - BUGFIX: Improve "Open destination folder" behavior + - BUGFIX: Fix race condition in RSS that could cause a crash on startup - COSMETIC: Improved transfer speed display in peers list * Wed Jan 20 2010 - Christophe Dumez - v2.1.1 diff --git a/src/feedList.h b/src/feedList.h index bbb79677f..4542df27f 100644 --- a/src/feedList.h +++ b/src/feedList.h @@ -154,7 +154,9 @@ signals: protected slots: void updateCurrentFeed(QTreeWidgetItem* new_item) { - if((new_item && getItemType(new_item) == RssFile::STREAM) || new_item == unread_item) + if(!new_item) return; + if(!mapping.contains(new_item)) return; + if((getItemType(new_item) == RssFile::STREAM) || new_item == unread_item) current_feed = new_item; }