From 279796494721b2f94a5a20f57f65f6728c92a12d Mon Sep 17 00:00:00 2001 From: Nick Tiskov Date: Mon, 1 Jul 2013 12:52:23 +0400 Subject: [PATCH] Fix failing asserts (rss settings are not saved). See Pull #675 --- src/rss/automatedrssdownloader.cpp | 16 ++++++++++------ src/rss/automatedrssdownloader.h | 1 + 2 files changed, 11 insertions(+), 6 deletions(-) diff --git a/src/rss/automatedrssdownloader.cpp b/src/rss/automatedrssdownloader.cpp index 7294a10e0..72251735b 100644 --- a/src/rss/automatedrssdownloader.cpp +++ b/src/rss/automatedrssdownloader.cpp @@ -93,6 +93,8 @@ AutomatedRssDownloader::AutomatedRssDownloader(const QWeakPointer& m Q_ASSERT(ok); ok = connect(ui->checkRegex, SIGNAL(stateChanged(int)), SLOT(updateMustNotLineValidity())); Q_ASSERT(ok); + ok = connect(this, SIGNAL(finished(int)), SLOT(on_finished(int))); + Q_ASSERT(ok); updateRuleDefinitionBox(); updateFeedList(); } @@ -100,11 +102,6 @@ AutomatedRssDownloader::AutomatedRssDownloader(const QWeakPointer& m AutomatedRssDownloader::~AutomatedRssDownloader() { qDebug() << Q_FUNC_INFO; - // Save current item on exit - saveEditedRule(); - m_ruleList->replace(m_editableRuleList); - m_ruleList->saveRulesToStorage(); - saveSettings(); delete ui; delete m_editableRuleList; } @@ -592,4 +589,11 @@ void AutomatedRssDownloader::updateMustNotLineValidity() } } - +void AutomatedRssDownloader::on_finished(int result) { + Q_UNUSED(result); + // Save current item on exit + saveEditedRule(); + m_ruleList->replace(m_editableRuleList); + m_ruleList->saveRulesToStorage(); + saveSettings(); +} diff --git a/src/rss/automatedrssdownloader.h b/src/rss/automatedrssdownloader.h index bda364427..630052112 100644 --- a/src/rss/automatedrssdownloader.h +++ b/src/rss/automatedrssdownloader.h @@ -80,6 +80,7 @@ private slots: void updateFieldsToolTips(bool regex); void updateMustLineValidity(); void updateMustNotLineValidity(); + void on_finished(int result); private: RssDownloadRulePtr getCurrentRule() const;