bump CEC_LATEST_ADAPTER_FW_VERSION

[deb_libcec.git] / src / lib / CECClient.cpp

diff --git a/src/lib/CECClient.cpp b/src/lib/CECClient.cpp
index 3004d870a1d9daf603e1c591d4e5924086fd1e4e..dc4bbd88676f06ff6b9cf6bf9aebc87d521abae8 100644 (file)
--- a/src/lib/CECClient.cpp
+++ b/src/lib/CECClient.cpp
@@ -954,7 +954,7 @@ void CCECClient::AddKey(const cec_keypress &key)
       if (key.keycode == CEC_USER_CONTROL_CODE_SELECT)
         transmitKey.keycode = CEC_USER_CONTROL_CODE_EXIT;
       // stop + pause -> root menu
-      else if (key.keycode == CEC_USER_CONTROL_CODE_ROOT_MENU)
+      else if (key.keycode == CEC_USER_CONTROL_CODE_PAUSE)
         transmitKey.keycode = CEC_USER_CONTROL_CODE_ROOT_MENU;
       // stop + play -> dot (which is handled as context menu in xbmc)
       else if (key.keycode == CEC_USER_CONTROL_CODE_PLAY)
@@ -964,8 +964,11 @@ void CCECClient::AddKey(const cec_keypress &key)
         AddKey(true);
     }
 
-    m_iCurrentButton = transmitKey.keycode;
-    m_buttontime = m_iCurrentButton == CEC_USER_CONTROL_CODE_UNKNOWN || key.duration > 0 ? 0 : GetTimeMs();
+    if (key.duration == 0)
+    {
+      m_iCurrentButton = transmitKey.keycode;
+      m_buttontime = m_iCurrentButton == CEC_USER_CONTROL_CODE_UNKNOWN || key.duration > 0 ? 0 : GetTimeMs();
+    }
   }
 
   if (key.keycode != COMBO_KEY || key.duration > 0)