From 1287c9419a6dcc317977eba6347e85ced4b84374 Mon Sep 17 00:00:00 2001
From: Randy Heit <rheit@zdoom.fake>
Date: Sun, 24 Oct 2010 17:46:48 +0000
Subject: [PATCH] - Fixed: Controller buttons were still translated to menu
 buttons when the controls menu was   waiting for a button press, making it
 impossible to bind buttons that have special meaning to   the menu from the
 menu.

SVN r2967 (trunk)
---
 src/menu/menu.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/menu/menu.cpp b/src/menu/menu.cpp
index b4e64b6a9e..0bdc622fce 100644
--- a/src/menu/menu.cpp
+++ b/src/menu/menu.cpp
@@ -544,7 +544,7 @@ bool M_Responder (event_t *ev)
 				}
 			}
 		}
-		else if (ev->type == EV_KeyDown || ev->type == EV_KeyUp)
+		else if (menuactive != MENU_WaitKey && (ev->type == EV_KeyDown || ev->type == EV_KeyUp))
 		{
 			keyup = ev->type == EV_KeyUp;