Merge branch 'master' into pu/mp

This commit is contained in:
Jacek Jendrzej
2017-08-14 16:26:49 +02:00
6 changed files with 12 additions and 35 deletions

View File

@@ -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))