From 85ff18bd8d5ab8935758d206886d07cd8cf0159d Mon Sep 17 00:00:00 2001
From: fledge68 <fledge68@gmail.com>
Date: Fri, 17 Aug 2012 14:42:37 +0000
Subject: [PATCH] - Now we can hold 'b' for source menu even if wiimote
 gestures is enabled. Which means we should be able to remove 'b' on home
 button and 'b' on mode button.

---
 source/menu/menu_main.cpp | 41 +++++++++++++++++++++------------------
 1 file changed, 22 insertions(+), 19 deletions(-)

diff --git a/source/menu/menu_main.cpp b/source/menu/menu_main.cpp
index c6564015..0a305011 100644
--- a/source/menu/menu_main.cpp
+++ b/source/menu/menu_main.cpp
@@ -514,20 +514,25 @@ int CMenu::main(void)
 			}
 		}
 		else if(WROLL_LEFT)
+		{
 			m_cf.left();
+			SourceMenuTimeout = 0;
+		}
 		else if(WROLL_RIGHT)
+		{
 			m_cf.right();
-
+			SourceMenuTimeout = 0;
+		}
 		if(!BTN_B_HELD)
 		{
 			SourceMenuTimeout = 0;
 			if(BTN_UP_REPEAT || RIGHT_STICK_UP)
 				m_cf.up();
-			else if((BTN_RIGHT_REPEAT || RIGHT_STICK_RIGHT) || WROLL_RIGHT)
+			else if(BTN_RIGHT_REPEAT || RIGHT_STICK_RIGHT)
 				m_cf.right();
 			else if(BTN_DOWN_REPEAT ||  RIGHT_STICK_DOWN)
 				m_cf.down();
-			else if((BTN_LEFT_REPEAT || RIGHT_STICK_LEFT) || WROLL_LEFT)
+			else if(BTN_LEFT_REPEAT || RIGHT_STICK_LEFT)
 				m_cf.left();
 			else if(BTN_1_PRESSED || BTN_2_PRESSED)
 			{
@@ -682,24 +687,22 @@ int CMenu::main(void)
 					_initCF();
 				}
 			}
-			else if(!enable_wmote_roll)
+			if(!SourceMenuTimeout && !bheld)
 			{
-				if(!SourceMenuTimeout && !bheld)
-				{
-					SourceMenuTimeout = time(0);
-					bheld = true;
-				}
-				if(SourceMenuTimeout && (time(0) - SourceMenuTimeout > 1)) //Source Menu requested
-				{
-					SourceMenuTimeout = 0;
-					_hideMain();
-					if(!_Source()) //Different source selected
-						LoadView();
-					else
-						_showMain();
-					continue;
-				}
+				SourceMenuTimeout = time(0);
+				bheld = true;
 			}
+			if(SourceMenuTimeout && (time(0) - SourceMenuTimeout > 1)) //Source Menu requested
+			{
+				SourceMenuTimeout = 0;
+				_hideMain();
+				if(!_Source()) //Different source selected
+					LoadView();
+				else
+					_showMain();
+				continue;
+			}
+
 		}
 
 		if(done==0 && m_cat.getBool("GENERAL", "category_on_start", false))