mirror of
https://github.com/tuxbox-neutrino/neutrino.git
synced 2025-09-01 18:01:13 +02:00
Merge branch 'master' into pu/mp
This commit is contained in:
@@ -131,13 +131,7 @@ bool CMenuItem::initModeCondition(const int& stb_mode)
|
||||
void CMenuItem::disableByCondition(const menu_item_disable_cond_t& condition)
|
||||
{
|
||||
int stb_mode = CNeutrinoApp::getInstance()->getMode();
|
||||
#if ENABLE_UPNP
|
||||
if (condition & DCOND_MODE_UPNP){
|
||||
if (stb_mode == CNeutrinoApp::mode_upnp)
|
||||
if (initModeCondition(stb_mode))
|
||||
return;
|
||||
}
|
||||
#endif
|
||||
|
||||
if (condition & DCOND_MODE_TS){
|
||||
if (stb_mode == CNeutrinoApp::mode_ts)
|
||||
if (initModeCondition(stb_mode))
|
||||
|
Reference in New Issue
Block a user