From 8e99e79e6dcae4385fd2f26515a3d724cfc0c3af Mon Sep 17 00:00:00 2001
From: Thilo Graf <dbt@novatux.de>
Date: Tue, 30 Apr 2019 23:28:35 +0200
Subject: [PATCH] followscreenings: add missing logic OR with
 getUseChannelFilter()

---
 src/gui/followscreenings.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/gui/followscreenings.cpp b/src/gui/followscreenings.cpp
index 02f09486c..1e190fa57 100644
--- a/src/gui/followscreenings.cpp
+++ b/src/gui/followscreenings.cpp
@@ -101,7 +101,7 @@ int CFollowScreenings::exec(CMenuTarget* /*parent*/, const std::string & actionK
 #endif
 							return menu_return::RETURN_REPAINT;
 						}
-						if (!SAME_TRANSPONDER(channel_id, i->channel_id)) {
+						if (!SAME_TRANSPONDER(channel_id, i->channel_id) || CZapit::getInstance()->getUseChannelFilter()) {
 							if (!askUserOnTimerConflict(start, stop, channel_id))
 								return menu_return::RETURN_REPAINT;
 							else