mirror of
https://github.com/tuxbox-fork-migrations/recycled-ni-neutrino.git
synced 2025-08-29 08:21:07 +02:00
Merge branch 'ni/tuxbox' into ni/mp/tuxbox
Conflicts:
src/neutrino.cpp
Origin commit data
------------------
Branch: ni/coolstream
Commit: 3c35e98212
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-08-25 (Fri, 25 Aug 2017)
------------------
This commit was generated by Migit
This commit is contained in:
@@ -137,13 +137,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