From 3c9e16c35ee9f69987902e04d4b5ad9ace3d9bb0 Mon Sep 17 00:00:00 2001 From: fledge68 Date: Sat, 18 Feb 2012 04:59:01 +0000 Subject: [PATCH] -parental lock fixes --- source/menu/menu_config.cpp | 4 ++-- source/menu/menu_main.cpp | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/source/menu/menu_config.cpp b/source/menu/menu_config.cpp index f7ce3286..559df5d4 100644 --- a/source/menu/menu_config.cpp +++ b/source/menu/menu_config.cpp @@ -84,7 +84,7 @@ void CMenu::_showConfig(void) _setBg(m_configBg, m_configBg); m_btnMgr.show(m_configLblTitle); m_btnMgr.show(m_configBtnBack); - if (m_current_view != COVERFLOW_DML) + if (m_current_view != COVERFLOW_DML && !m_locked) { m_btnMgr.show(m_configLblPartitionName); m_btnMgr.show(m_configLblPartition); @@ -119,7 +119,7 @@ void CMenu::_showConfig(void) m_btnMgr.setText(m_configLblPage, wfmt(L"%i / %i", g_curPage, m_locked ? g_curPage + 1 : CMenu::_nbCfgPages)); - if (m_current_view == COVERFLOW_CHANNEL || m_current_view == COVERFLOW_USB) + if ((m_current_view == COVERFLOW_CHANNEL || m_current_view == COVERFLOW_USB) && !m_locked) { m_btnMgr.show(m_configLblEmulation); m_btnMgr.show(m_configLblEmulationVal); diff --git a/source/menu/menu_main.cpp b/source/menu/menu_main.cpp index 7cc47008..f0bb3d68 100644 --- a/source/menu/menu_main.cpp +++ b/source/menu/menu_main.cpp @@ -101,7 +101,7 @@ void CMenu::_showMain(void) m_btnMgr.show(m_mainBtnUsb); break; case COVERFLOW_CHANNEL: - if(show_homebrew) + if (show_homebrew && (parental_homebrew || !m_locked)) m_btnMgr.show(m_mainBtnHomebrew); else m_btnMgr.show(m_mainBtnUsb);