Merge pull request #9260 from koying/fixeatenkey16.1rc1-Jarvis

FIX: [longpress] do not eat keypress after a longpress

1 files changed, 3 insertions, 3 deletions

diff --git a/xbmc/input/InputManager.cpp b/xbmc/input/InputManager.cpp
index 582ab35b2b..1e21e7bf7a 100644
--- a/xbmc/input/InputManager.cpp
+++ b/xbmc/input/InputManager.cpp
@@ -459,13 +459,13 @@ bool CInputManager::OnEvent(XBMC_Event& newEvent)
   {
   case XBMC_KEYDOWN:
   {
-    if (m_LastKey.GetButtonCode() & CKey::MODIFIER_LONG)
+    m_Keyboard.ProcessKeyDown(newEvent.key.keysym);
+    CKey key = m_Keyboard.TranslateKey(newEvent.key.keysym);
+    if (key.GetButtonCode() == m_LastKey.GetButtonCode() && m_LastKey.GetButtonCode() & CKey::MODIFIER_LONG)
     {
       // Do not repeat long presses
       break;
     }
-    m_Keyboard.ProcessKeyDown(newEvent.key.keysym);
-    CKey key = m_Keyboard.TranslateKey(newEvent.key.keysym);
     if (!CButtonTranslator::GetInstance().HasLonpressMapping(g_windowManager.GetActiveWindowID(), key))
     {
       m_LastKey.Reset();