mirrors/recycled-ni-neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-fork-migrations/recycled-ni-neutrino.git synced 2025-09-09 06:38:28 +02:00
Code Issues Packages Projects Releases Wiki Activity

neutrino: try to prevent using chanellist/bouquetlist while channels init in progress

Browse Source 
Origin commit data
------------------
Commit: 3da439030b
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2015-01-13 (Tue, 13 Jan 2015)
This commit is contained in:
[CST] Focus
2015-01-13 16:10:15 +03:00
parent 2a97182b35
commit e9a9b9abb3
5 changed files with 20 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/gui/bouquetlist.cpp
View File

@@ -563,6 +563,10 @@ int CBouquetList::show(bool bShowChannelList)
int new_selected = (chn - 1) % Bouquets.size(); // is % necessary (i.e. can firstselected be > Bouquets.size()) ?
updateSelection(new_selected);
}
} else if (msg == NeutrinoMessages::EVT_SERVICESCHANGED || msg == NeutrinoMessages::EVT_BOUQUETSCHANGED) {
g_RCInput->postMsg(msg, data);
loop = false;
res = CHANLIST_CANCEL_ALL;
} else if (msg > CRCInput::RC_MaxRC) {
if ( CNeutrinoApp::getInstance()->handleMsg( msg, data ) & messages_return::cancel_all ) {
loop = false;

4
src/gui/channellist.cpp
View File

@@ -902,6 +902,10 @@ int CChannelList::show()
paintHead();
paint();
} else if (msg == NeutrinoMessages::EVT_SERVICESCHANGED || msg == NeutrinoMessages::EVT_BOUQUETSCHANGED) {
g_RCInput->postMsg(msg, data);
loop = false;
res = CHANLIST_CANCEL_ALL;
} else {
if ( CNeutrinoApp::getInstance()->handleMsg( msg, data ) & messages_return::cancel_all ) {
loop = false;

4
src/gui/epgplus.cpp
View File

@@ -1132,6 +1132,10 @@ int EpgPlus::exec (CChannelList * pchannelList, int selectedChannelIndex, CBouqu
g_RCInput->postMsg (msg, 0);
res = menu_return::RETURN_EXIT_ALL;
loop = false;
} else if (msg == NeutrinoMessages::EVT_SERVICESCHANGED || msg == NeutrinoMessages::EVT_BOUQUETSCHANGED) {
g_RCInput->postMsg(msg, data);
loop = false;
res = menu_return::RETURN_EXIT_ALL;
}
else {
if (CNeutrinoApp::getInstance()->handleMsg (msg, data) & messages_return::cancel_all) {

4
src/gui/epgview.cpp
View File

@@ -970,6 +970,10 @@ int CEpgData::show(const t_channel_id channel_id, uint64_t a_id, time_t* a_start
msg = 0;
} else
loop = false;
} else if (msg == NeutrinoMessages::EVT_SERVICESCHANGED || msg == NeutrinoMessages::EVT_BOUQUETSCHANGED) {
g_RCInput->postMsg(msg, data);
loop = false;
res = menu_return::RETURN_EXIT_ALL;
}
else
{

4
src/gui/eventlist.cpp
View File

@@ -661,6 +661,10 @@ int CNeutrinoEventList::exec(const t_channel_id channel_id, const std::string& c
g_RCInput->postMsg (msg, 0);
res = menu_return::RETURN_EXIT_ALL;
loop = false;
} else if (msg == NeutrinoMessages::EVT_SERVICESCHANGED || msg == NeutrinoMessages::EVT_BOUQUETSCHANGED) {
g_RCInput->postMsg(msg, data);
loop = false;
res = menu_return::RETURN_EXIT_ALL;
}
else
{