From a8b1e41599fd1f18fccc8f34ddca2bca33c4bf4f Mon Sep 17 00:00:00 2001
From: Andrei Karas <akaras@inbox.ru>
Date: Wed, 30 May 2012 19:19:58 +0300
Subject: Fix key handling conflict issue in login dialog.

---
 src/gui/logindialog.cpp | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'src/gui/logindialog.cpp')

diff --git a/src/gui/logindialog.cpp b/src/gui/logindialog.cpp
index 63073e9d5..54be72a6e 100644
--- a/src/gui/logindialog.cpp
+++ b/src/gui/logindialog.cpp
@@ -314,8 +314,10 @@ void LoginDialog::action(const gcn::ActionEvent &event)
 
 void LoginDialog::keyPressed(gcn::KeyEvent &keyEvent)
 {
-    int actionId = static_cast<KeyEvent*>(&keyEvent)->getActionId();
+    if (keyEvent.isConsumed())
+        return;
 
+    int actionId = static_cast<KeyEvent*>(&keyEvent)->getActionId();
     if (actionId == Input::KEY_GUI_CANCEL)
     {
         action(gcn::ActionEvent(nullptr, mServerButton->getActionEventId()));
-- 
cgit v1.2.3-60-g2f50