- fixed holding 'b' for source menu. Now if you hold 'b' and press the d-pad, plus, or minus buttons the source menu won't show up until you release the 'b' button and hold it again with out pressing any other wiimote buttons.

This commit is contained in:
fledge68 2012-08-17 14:16:58 +00:00
parent e9341fd458
commit 30af787956

View File

@ -263,6 +263,7 @@ int CMenu::main(void)
bool dpad_mode = m_cfg.getBool("GENERAL", "dpad_mode", false);
bool b_lr_mode = m_cfg.getBool("GENERAL", "b_lr_mode", false);
bool use_grab = m_cfg.getBool("GENERAL", "use_grab", false);
bool bheld = false;
m_reload = false;
static u32 disc_check = 0;
@ -318,6 +319,11 @@ int CMenu::main(void)
coverstatus_stack.release();
WDVD_GetCoverStatus(&disc_check);
}
if(bheld && !BTN_B_HELD)
{
bheld = false;
SourceMenuTimeout = 0;
}
if(dpad_mode && (BTN_UP_PRESSED || BTN_DOWN_PRESSED || BTN_LEFT_PRESSED || BTN_RIGHT_PRESSED) && (m_btnMgr.selected(m_mainBtnChannel) || m_btnMgr.selected(m_mainBtnUsb) || m_btnMgr.selected(m_mainBtnDML) || m_btnMgr.selected(m_mainBtnHomebrew) || m_btnMgr.selected(m_mainBtnEmu)))
{
u32 lastView = m_current_view;
@ -678,9 +684,12 @@ int CMenu::main(void)
}
else if(!enable_wmote_roll)
{
if(!SourceMenuTimeout)
if(!SourceMenuTimeout && !bheld)
{
SourceMenuTimeout = time(0);
else if(time(0) - SourceMenuTimeout > 1) //Source Menu requested
bheld = true;
}
if(SourceMenuTimeout && (time(0) - SourceMenuTimeout > 1)) //Source Menu requested
{
SourceMenuTimeout = 0;
_hideMain();