mirror of
https://github.com/tuxbox-fork-migrations/recycled-ni-neutrino.git
synced 2025-09-02 18:31:12 +02:00
channellist: fix segfault while virtual zapping and bouquets are empty
Signed-off-by: Thilo Graf <dbt@novatux.de>
Origin commit data
------------------
Commit: 889c996624
Author: vanhofen <vanhofen@gmx.de>
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 <dbt@novatux.de>
This commit is contained in:
@@ -1471,7 +1471,10 @@ void CChannelList::virtual_zap_mode(bool up)
|
|||||||
g_RCInput->getMsg(&msg, &data, 15*10); // 15 seconds, not user changable
|
g_RCInput->getMsg(&msg, &data, 15*10); // 15 seconds, not user changable
|
||||||
|
|
||||||
if ((msg == CRCInput::RC_left) || (msg == CRCInput::RC_right)) {
|
if ((msg == CRCInput::RC_left) || (msg == CRCInput::RC_right)) {
|
||||||
|
if (!bouquetList->Bouquets.empty())
|
||||||
channel = bouquetList->Bouquets[bactive]->channelList->getPrevNextChannel(msg, sl);
|
channel = bouquetList->Bouquets[bactive]->channelList->getPrevNextChannel(msg, sl);
|
||||||
|
else
|
||||||
|
channel = CNeutrinoApp::getInstance()->channelList->getPrevNextChannel(msg, sl);
|
||||||
bactive = bouquetList->getActiveBouquetNumber();
|
bactive = bouquetList->getActiveBouquetNumber();
|
||||||
}
|
}
|
||||||
else if (msg == CRCInput::RC_up || msg == CRCInput::RC_down) {
|
else if (msg == CRCInput::RC_up || msg == CRCInput::RC_down) {
|
||||||
|
Reference in New Issue
Block a user