Browse Source

Fix failing asserts (rss settings are not saved).

See Pull #675
adaptive-webui-19844
Nick Tiskov 12 years ago
parent
commit
70a0de8de5
  1. 16
      src/rss/automatedrssdownloader.cpp
  2. 1
      src/rss/automatedrssdownloader.h

16
src/rss/automatedrssdownloader.cpp

@ -93,6 +93,8 @@ AutomatedRssDownloader::AutomatedRssDownloader(const QWeakPointer<RssManager>& m @@ -93,6 +93,8 @@ AutomatedRssDownloader::AutomatedRssDownloader(const QWeakPointer<RssManager>& 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<RssManager>& m @@ -100,11 +102,6 @@ AutomatedRssDownloader::AutomatedRssDownloader(const QWeakPointer<RssManager>& 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() @@ -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();
}

1
src/rss/automatedrssdownloader.h

@ -80,6 +80,7 @@ private slots: @@ -80,6 +80,7 @@ private slots:
void updateFieldsToolTips(bool regex);
void updateMustLineValidity();
void updateMustNotLineValidity();
void on_finished(int result);
private:
RssDownloadRulePtr getCurrentRule() const;

Loading…
Cancel
Save