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

Merge branch 'master' into pu/mp

Browse Source 
Origin commit data
------------------
Commit: ed416416cd
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2017-08-14 (Mon, 14 Aug 2017)
This commit is contained in:
Jacek Jendrzej
2017-08-14 16:26:49 +02:00
parent ee0fb81ab4 5ce4d5eb25
commit 6824f87be8
6 changed files with 12 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/gui/widget/menue.cpp
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))

3
src/gui/widget/menue.h
View File

@@ -78,9 +78,6 @@ enum
DCOND_MODE_TV = 2,
DCOND_MODE_RADIO = 4,
DCOND_MODE_TS = 8
#if ENABLE_UPNP
,DCOND_MODE_UPNP = 16
#endif
}/*menu_item_disable_cond_t*/;
class CChangeObserver