mirrors/neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-neutrino/neutrino.git synced 2025-08-31 01:11:12 +02:00
Code Issues Packages Projects Releases Wiki Activity

followscreenings: add missing logic OR with getUseChannelFilter()

Browse Source
This commit is contained in:
Thilo Graf
2019-04-30 23:28:35 +02:00
parent f413089488
commit 8e99e79e6d
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/gui/followscreenings.cpp
View File

@@ -101,7 +101,7 @@ int CFollowScreenings::exec(CMenuTarget* /*parent*/, const std::string & actionK
#endif #endif
return menu_return::RETURN_REPAINT; 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)) if (!askUserOnTimerConflict(start, stop, channel_id))
return menu_return::RETURN_REPAINT; return menu_return::RETURN_REPAINT;
else else