-fix for source menu disable message not showing when a view is disabled.

-fix for hiding homebrew view and icon when it's disabled.
This commit is contained in:
fledge68 2013-09-21 16:33:16 +00:00
parent ab7ecc61b7
commit f2e1c30056
2 changed files with 6 additions and 4 deletions

View File

@ -100,7 +100,7 @@ start_main:
m_btnMgr.show(m_mainBtnChannel); m_btnMgr.show(m_mainBtnChannel);
else if(show_emu) else if(show_emu)
m_btnMgr.show(m_mainBtnEmu); m_btnMgr.show(m_mainBtnEmu);
else if(show_homebrew) else if(show_homebrew && (parental_homebrew || !m_locked))
m_btnMgr.show(m_mainBtnHomebrew); m_btnMgr.show(m_mainBtnHomebrew);
else else
m_btnMgr.show(m_mainBtnUsb); m_btnMgr.show(m_mainBtnUsb);
@ -349,7 +349,7 @@ int CMenu::main(void)
m_current_view = COVERFLOW_PLUGIN; m_current_view = COVERFLOW_PLUGIN;
else if(BTN_RIGHT_PRESSED && show_channel) else if(BTN_RIGHT_PRESSED && show_channel)
m_current_view = COVERFLOW_CHANNEL; m_current_view = COVERFLOW_CHANNEL;
if(lastView == m_current_view) if(lastView == m_current_view && show_homebrew && (parental_homebrew || !m_locked))
m_current_view = COVERFLOW_HOMEBREW; m_current_view = COVERFLOW_HOMEBREW;
_clearSources(); _clearSources();
switch(m_current_view) switch(m_current_view)
@ -820,7 +820,7 @@ int CMenu::main(void)
m_btnMgr.show(m_mainBtnChannel); m_btnMgr.show(m_mainBtnChannel);
else if(show_emu) else if(show_emu)
m_btnMgr.show(m_mainBtnEmu); m_btnMgr.show(m_mainBtnEmu);
else if(show_homebrew) else if(show_homebrew && (parental_homebrew || !m_locked))
m_btnMgr.show(m_mainBtnHomebrew); m_btnMgr.show(m_mainBtnHomebrew);
else else
m_btnMgr.show(m_mainBtnUsb); m_btnMgr.show(m_mainBtnUsb);

View File

@ -34,6 +34,7 @@ s16 m_sourceBtnHomebrew;
TexData m_sourceBg; TexData m_sourceBg;
bool exitSource = false;
u8 sourceBtn; u8 sourceBtn;
u8 selectedBtns; u8 selectedBtns;
int source_curPage; int source_curPage;
@ -188,6 +189,7 @@ void CMenu::_showSourceNotice(void)
{ {
m_showtimer = 90; m_showtimer = 90;
m_btnMgr.show(m_sourceLblNotice); m_btnMgr.show(m_sourceLblNotice);
exitSource = false;
} }
dir_discHdr sourceList; dir_discHdr sourceList;
@ -352,7 +354,7 @@ bool CMenu::_Source()
bool parental_homebrew = m_cfg.getBool(HOMEBREW_DOMAIN, "parental", false); bool parental_homebrew = m_cfg.getBool(HOMEBREW_DOMAIN, "parental", false);
bool noChanges = true; bool noChanges = true;
bool updateSource = false; bool updateSource = false;
bool exitSource = false; exitSource = false;
u8 numPlugins = 0; u8 numPlugins = 0;
m_showtimer = 0; m_showtimer = 0;
source_curPage = 1; source_curPage = 1;