- removed b on mode and b on home buttons to source menu. b on mode still switches from real nand to emu nand and back

This commit is contained in:
fledge68 2012-09-01 14:27:49 +00:00
parent 65abbfbb4b
commit c70e2f5c84

View File

@ -480,18 +480,7 @@ int CMenu::main(void)
//Events to Switch off/on nand emu //Events to Switch off/on nand emu
else if(m_btnMgr.selected(m_mainBtnChannel) || m_btnMgr.selected(m_mainBtnUsb) || m_btnMgr.selected(m_mainBtnDML)|| m_btnMgr.selected(m_mainBtnEmu) || m_btnMgr.selected(m_mainBtnHomebrew)) else if(m_btnMgr.selected(m_mainBtnChannel) || m_btnMgr.selected(m_mainBtnUsb) || m_btnMgr.selected(m_mainBtnDML)|| m_btnMgr.selected(m_mainBtnEmu) || m_btnMgr.selected(m_mainBtnHomebrew))
{ {
if(m_cfg.getBool("GENERAL", "b_on_mode_to_source", false)) if(!neek2o())
{
_hideMain();
if(!_Source()) //Different source selected
LoadView();
else
_showMain();
if(BTN_B_HELD)
bUsed = true;
continue;
}
else if(!neek2o())
{ {
bUsed = true; bUsed = true;
m_cfg.setBool("NAND", "disable", !m_cfg.getBool("NAND", "disable", true)); m_cfg.setBool("NAND", "disable", !m_cfg.getBool("NAND", "disable", true));
@ -528,17 +517,6 @@ int CMenu::main(void)
m_btnMgr.show(m_mainLblNotice); m_btnMgr.show(m_mainLblNotice);
} }
} }
else if(enable_wmote_roll && m_btnMgr.selected(m_mainBtnQuit))
{
_hideMain();
if(!_Source()) //Different source selected
LoadView();
else
_showMain();
if(BTN_B_HELD)
bUsed = true;
continue;
}
} }
else if(WROLL_LEFT) else if(WROLL_LEFT)
{ {
@ -552,7 +530,6 @@ int CMenu::main(void)
} }
if(!BTN_B_HELD) if(!BTN_B_HELD)
{ {
//SourceMenuTimeout = 0;
if(BTN_UP_REPEAT || RIGHT_STICK_UP) if(BTN_UP_REPEAT || RIGHT_STICK_UP)
m_cf.up(); m_cf.up();
else if(BTN_RIGHT_REPEAT || RIGHT_STICK_RIGHT) else if(BTN_RIGHT_REPEAT || RIGHT_STICK_RIGHT)