From 5dede9e433a2caf1008becd7c7f6d64878aed129 Mon Sep 17 00:00:00 2001 From: Gabriele Date: Tue, 25 Nov 2014 19:00:38 +0100 Subject: [PATCH] Use correct separator for "OR" condition in RSS rules Although RSS rules were correctly parsed, the wrong separator for the "OR" condition was used to re-generate the string of the rule displayed in the preferences. Closes #2205. --- src/rss/rssdownloadrule.cpp | 2 +- src/rss/rssdownloadrule.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/rss/rssdownloadrule.cpp b/src/rss/rssdownloadrule.cpp index c5c3ade38..bb8cb36fe 100644 --- a/src/rss/rssdownloadrule.cpp +++ b/src/rss/rssdownloadrule.cpp @@ -156,7 +156,7 @@ QVariantHash RssDownloadRule::toVariantHash() const QVariantHash hash; hash["name"] = m_name; hash["must_contain"] = m_mustContain.join(" "); - hash["must_not_contain"] = m_mustNotContain.join(" "); + hash["must_not_contain"] = m_mustNotContain.join("|"); hash["save_path"] = m_savePath; hash["affected_feeds"] = m_rssFeeds; hash["enabled"] = m_enabled; diff --git a/src/rss/rssdownloadrule.h b/src/rss/rssdownloadrule.h index 6078de129..9840f62b5 100644 --- a/src/rss/rssdownloadrule.h +++ b/src/rss/rssdownloadrule.h @@ -62,7 +62,7 @@ public: inline bool isEnabled() const { return m_enabled; } inline void setEnabled(bool enable) { m_enabled = enable; } inline QString mustContain() const { return m_mustContain.join(" "); } - inline QString mustNotContain() const { return m_mustNotContain.join(" "); } + inline QString mustNotContain() const { return m_mustNotContain.join("|"); } inline bool useRegex() const { return m_useRegex; } inline void setUseRegex(bool enabled) { m_useRegex = enabled; } inline QString episodeFilter() const { return m_episodeFilter; }