diff --git a/src/librssguard/gui/reusable/articleamountcontrol.cpp b/src/librssguard/gui/reusable/articleamountcontrol.cpp index 5e357d029..bc3270cad 100644 --- a/src/librssguard/gui/reusable/articleamountcontrol.cpp +++ b/src/librssguard/gui/reusable/articleamountcontrol.cpp @@ -83,18 +83,24 @@ void ArticleAmountControl::setForAppWideFeatures(bool app_wide, bool batch_edit) } } -void ArticleAmountControl::load(const Feed::ArticleIgnoreLimit& setup) { +void ArticleAmountControl::load(const Feed::ArticleIgnoreLimit& setup, bool always_avoid) { // Ignoring articles. if (setup.m_dtToAvoid.isValid() && setup.m_dtToAvoid.toMSecsSinceEpoch() > 0) { m_ui.m_rbAvoidAbsolute->setChecked(true); m_ui.m_dtDateTimeToAvoid->setDateTime(setup.m_dtToAvoid); } - else { + else if (setup.m_hoursToAvoid > 0) { m_ui.m_rbAvoidRelative->setChecked(true); m_ui.m_spinHoursAvoid->setValue(setup.m_hoursToAvoid); } - m_ui.m_gbAvoidOldArticles->setChecked(setup.m_avoidOldArticles); + if (always_avoid) { + m_ui.m_gbAvoidOldArticles->setChecked(m_ui.m_rbAvoidAbsolute->isChecked() || m_ui.m_rbAvoidRelative->isChecked()); + } + else { + m_ui.m_gbAvoidOldArticles->setChecked(setup.m_avoidOldArticles); + } + m_ui.m_cbAddAnyDateArticles->setChecked(setup.m_addAnyArticlesToDb); // Limitting articles. diff --git a/src/librssguard/gui/reusable/articleamountcontrol.h b/src/librssguard/gui/reusable/articleamountcontrol.h index b5abd7154..c9185a63b 100644 --- a/src/librssguard/gui/reusable/articleamountcontrol.h +++ b/src/librssguard/gui/reusable/articleamountcontrol.h @@ -19,7 +19,7 @@ class ArticleAmountControl : public QWidget { void setForAppWideFeatures(bool app_wide, bool batch_edit); - void load(const Feed::ArticleIgnoreLimit& setup); + void load(const Feed::ArticleIgnoreLimit& setup, bool always_avoid = false); Feed::ArticleIgnoreLimit save() const; void saveFeed(Feed* fd, bool batch_edit) const; diff --git a/src/librssguard/services/abstract/gui/formfeeddetails.cpp b/src/librssguard/services/abstract/gui/formfeeddetails.cpp index 869673f03..c2abc3f7a 100644 --- a/src/librssguard/services/abstract/gui/formfeeddetails.cpp +++ b/src/librssguard/services/abstract/gui/formfeeddetails.cpp @@ -164,7 +164,7 @@ void FormFeedDetails::loadFeedData() { art_limit.m_moveToBinDontPurge = false; */ - m_ui.m_wdgArticleLimiting->load(art_limit); + m_ui.m_wdgArticleLimiting->load(art_limit, true); } void FormFeedDetails::acceptIfPossible() {