From a99ed9a19dadd01a885e30181c3a708772204ba3 Mon Sep 17 00:00:00 2001 From: vanhofen Date: Mon, 11 Dec 2017 12:57:56 +0100 Subject: [PATCH 1/3] rcinput: fix compiler warnings about unused variables Signed-off-by: Thilo Graf Origin commit data ------------------ Commit: https://github.com/neutrino-images/ni-neutrino/commit/ac9a7c43cb9fc229a46753b7b438fa52615c7e45 Author: vanhofen Date: 2017-12-11 (Mon, 11 Dec 2017) Origin message was: ------------------ - rcinput: fix compiler warnings about unused variables Signed-off-by: Thilo Graf --- src/driver/rcinput.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/driver/rcinput.cpp b/src/driver/rcinput.cpp index 2f45b9269..7c0da87a4 100644 --- a/src/driver/rcinput.cpp +++ b/src/driver/rcinput.cpp @@ -194,10 +194,8 @@ void CRCInput::open(bool recheck) /* close() takes the lock, too... */ OpenThreads::ScopedLock m_lock(mutex); - unsigned long evbit; struct in_dev id; DIR *dir; - struct dirent *dentry; dir = opendir("/dev/input"); if (! dir) { printf("[rcinput:%s] opendir failed: %m\n", __func__); @@ -205,6 +203,8 @@ void CRCInput::open(bool recheck) } #if !HAVE_GENERIC_HARDWARE + unsigned long evbit; + struct dirent *dentry; while ((dentry = readdir(dir)) != NULL) { id.path = "/dev/input/" + std::string(dentry->d_name); From 32797a05de34656ac7fb683ee026e990d96a31fd Mon Sep 17 00:00:00 2001 From: vanhofen Date: Mon, 11 Dec 2017 13:05:18 +0100 Subject: [PATCH 2/3] channellist: fix segfault while virtual zapping and bouquets are empty Signed-off-by: Thilo Graf Origin commit data ------------------ Commit: https://github.com/neutrino-images/ni-neutrino/commit/889c9966244c77a8a1a47d450d3512c4ee5585a0 Author: vanhofen Date: 2017-12-11 (Mon, 11 Dec 2017) Origin message was: ------------------ - channellist: fix segfault while virtual zapping and bouquets are empty Signed-off-by: Thilo Graf --- src/gui/channellist.cpp | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/gui/channellist.cpp b/src/gui/channellist.cpp index 91be050da..6892988e9 100644 --- a/src/gui/channellist.cpp +++ b/src/gui/channellist.cpp @@ -1471,7 +1471,10 @@ void CChannelList::virtual_zap_mode(bool up) g_RCInput->getMsg(&msg, &data, 15*10); // 15 seconds, not user changable if ((msg == CRCInput::RC_left) || (msg == CRCInput::RC_right)) { - channel = bouquetList->Bouquets[bactive]->channelList->getPrevNextChannel(msg, sl); + if (!bouquetList->Bouquets.empty()) + channel = bouquetList->Bouquets[bactive]->channelList->getPrevNextChannel(msg, sl); + else + channel = CNeutrinoApp::getInstance()->channelList->getPrevNextChannel(msg, sl); bactive = bouquetList->getActiveBouquetNumber(); } else if (msg == CRCInput::RC_up || msg == CRCInput::RC_down) { From b86d72f2d490e7d54311d62eea679068e183a426 Mon Sep 17 00:00:00 2001 From: Thilo Graf Date: Mon, 11 Dec 2017 17:20:04 +0100 Subject: [PATCH 3/3] CZapitChannel: add issue tag This should be reworked Origin commit data ------------------ Commit: https://github.com/neutrino-images/ni-neutrino/commit/4bacd77f8bcd61c21b99a1cfc52fce6a8d46c5fd Author: Thilo Graf Date: 2017-12-11 (Mon, 11 Dec 2017) --- src/zapit/src/channel.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/zapit/src/channel.cpp b/src/zapit/src/channel.cpp index fd8ccb586..7779d6728 100644 --- a/src/zapit/src/channel.cpp +++ b/src/zapit/src/channel.cpp @@ -218,7 +218,7 @@ bool CZapitChannel::isUHD() if(strstr(name.c_str(),uhd.c_str())) return true; uhd = "4k"; - if(strstr(name.c_str(),uhd.c_str())) + if(strstr(name.c_str(),uhd.c_str())) //FIXME: this statement may fall through return true; } default: