d4708/qBittorrent
1
0
Fork 0
mirror of https://github.com/d47081/qBittorrent.git synced 2025-01-09 14:27:56 +00:00
Code Issues Projects Releases Wiki Activity

Fix crash when hiding RSS and then showing it again

Browse Source
This commit is contained in:
Christophe Dumez 2010-11-13 20:14:59 +00:00
parent ad087d7e88
commit e11545c8a3
5 changed files with 11 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/GUI.cpp
View File

@ -364,7 +364,7 @@ void GUI::displayRSSTab(bool enable) {
if(enable) { if(enable) {
// RSS tab // RSS tab
if(!rssWidget) { if(!rssWidget) {
rssWidget = new RSSImp(BTSession); rssWidget = new RSSImp(tabs);
int index_tab = tabs->addTab(rssWidget, tr("RSS")); int index_tab = tabs->addTab(rssWidget, tr("RSS"));
tabs->setTabIcon(index_tab, QIcon(QString::fromUtf8(":/Icons/rss32.png"))); tabs->setTabIcon(index_tab, QIcon(QString::fromUtf8(":/Icons/rss32.png")));
} }

4
src/qtlibtorrent/qbtsession.cpp
View File

@ -2641,6 +2641,8 @@ QBtSession * QBtSession::instance()
void QBtSession::drop() void QBtSession::drop()
{ {
if(m_instance) if(m_instance) {
delete m_instance; delete m_instance;
m_instance = 0;
}
} }

6
src/rss/rss_imp.cpp
View File

@ -307,9 +307,9 @@ void RSSImp::downloadTorrent() {
foreach(const QTreeWidgetItem* item, selected_items) { foreach(const QTreeWidgetItem* item, selected_items) {
RssArticle* article = listStreams->getRSSItemFromUrl(item->text(NEWS_URL_COL))->getItem(item->text(NEWS_ID)); RssArticle* article = listStreams->getRSSItemFromUrl(item->text(NEWS_URL_COL))->getItem(item->text(NEWS_ID));
if(article->has_attachment()) { if(article->has_attachment()) {
BTSession->downloadFromUrl(article->getTorrentUrl()); QBtSession::instance()->downloadFromUrl(article->getTorrentUrl());
} else { } else {
BTSession->downloadFromUrl(article->getLink()); QBtSession::instance()->downloadFromUrl(article->getLink());
} }
} }
} }
@ -577,7 +577,7 @@ void RSSImp::updateRefreshInterval(unsigned int val) {
rssmanager->updateRefreshInterval(val); rssmanager->updateRefreshInterval(val);
} }
RSSImp::RSSImp(QBtSession *BTSession) : QWidget(), BTSession(BTSession){ RSSImp::RSSImp(QWidget *parent) : QWidget(parent) {
setupUi(this); setupUi(this);
rssmanager = RssManager::instance(); rssmanager = RssManager::instance();

4
src/rss/rss_imp.h
View File

@ -36,7 +36,6 @@
#include "ui_rss.h" #include "ui_rss.h"
class QBtSession;
class FeedListWidget; class FeedListWidget;
class QTreeWidgetItem; class QTreeWidgetItem;
class RssFolder; class RssFolder;
@ -46,7 +45,7 @@ class RSSImp : public QWidget, public Ui::RSS{
Q_OBJECT Q_OBJECT
public: public:
RSSImp(QBtSession *BTSession); RSSImp(QWidget *parent);
~RSSImp(); ~RSSImp();
public slots: public slots:
@ -85,7 +84,6 @@ private slots:
private: private:
RssManager *rssmanager; RssManager *rssmanager;
QBtSession *BTSession;
FeedListWidget *listStreams; FeedListWidget *listStreams;
QTreeWidgetItem* previous_news; QTreeWidgetItem* previous_news;

4
src/rss/rssmanager.cpp
View File

@ -149,6 +149,8 @@ RssManager * RssManager::instance()
void RssManager::drop() void RssManager::drop()
{ {
if(m_instance) if(m_instance) {
delete m_instance; delete m_instance;
m_instance = 0;
}
} }