From 2ac1d38d623c82e7e79d5c038f7ca85854ae5b99 Mon Sep 17 00:00:00 2001
From: David Capello <davidcapello@gmail.com>
Date: Tue, 1 Mar 2011 22:37:00 -0300
Subject: [PATCH] Avoid sending keys to gui manager when a popup frame is
 visible.

---
 src/gui/popup_frame.cpp | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/src/gui/popup_frame.cpp b/src/gui/popup_frame.cpp
index a4bf2fb2c..09a93a41c 100644
--- a/src/gui/popup_frame.cpp
+++ b/src/gui/popup_frame.cpp
@@ -100,9 +100,13 @@ bool PopupFrame::onProcessMessage(JMessage msg)
       break;
 
     case JM_KEYPRESSED:
-      if (m_filtering && msg->key.scancode < KEY_MODIFIERS)
+      if (m_filtering &&
+	  (msg->key.scancode == KEY_ESC ||
+	   msg->key.scancode == KEY_ENTER ||
+	   msg->key.scancode == KEY_ENTER_PAD)) {
 	closeWindow(NULL);
-      break;
+      }
+      return false;
 
     case JM_BUTTONPRESSED:
       /* if the user click outside the window, we have to close the