Remote play button was still being read out with remote hold key on.

git-svn-id: svn://svn.rockbox.org/rockbox/trunk@11076 a1c6a512-1295-4272-9138-f99709370657

1 files changed, 4 insertions, 1 deletions

diff --git a/firmware/target/coldfire/iaudio/x5/button-x5.c b/firmware/target/coldfire/iaudio/x5/button-x5.c
index 84d1dbc7d8..5874e01a64 100755
--- a/firmware/target/coldfire/iaudio/x5/button-x5.c
+++ b/firmware/target/coldfire/iaudio/x5/button-x5.c
@@ -128,10 +128,13 @@ int button_read_device(void)
     }
 
     data = GPIO_READ;
+
+    /* hold and power are mutually exclusive */
     if (!(data & 0x04000000))
         btn |= BUTTON_POWER;
 
-    if (!(data & 0x02000000))
+    /* remote play button should be dead if hold */
+    if (!remote_hold_button && !(data & 0x02000000))
         btn |= BUTTON_RC_PLAY;
 
     return btn;