summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThomas Jarosch <tomj@simonv.com>2015-01-04 12:03:21 +0100
committerSolomon Peachy <pizza@shaftnet.org>2020-04-17 04:33:17 +0200
commit87f54b974588b29a790104f760ed1c1fccc3d3fa (patch)
tree98e37c2bfe40d4b73115fc796fb34b4646afa095
parente0d7c7c6326b0620b3969880b9b55a8e8f090a69 (diff)
downloadrockbox-87f54b974588b29a790104f760ed1c1fccc3d3fa.tar.gz
rockbox-87f54b974588b29a790104f760ed1c1fccc3d3fa.tar.bz2
rockbox-87f54b974588b29a790104f760ed1c1fccc3d3fa.zip
Alpine CD changer emulation: Fix logic error in detecting non-playing status
cppcheck reported: apps/plugins/alpine_cdc.c:721]: (warning) Logical disjunction always evaluates to true: EXPR != 4 || EXPR != 3. Change-Id: Ib811defeac18832227aebe96f0524670c2afa76a
-rw-r--r--apps/plugins/alpine_cdc.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/apps/plugins/alpine_cdc.c b/apps/plugins/alpine_cdc.c
index 28bb8d8b7f..93d9418f65 100644
--- a/apps/plugins/alpine_cdc.c
+++ b/apps/plugins/alpine_cdc.c
@@ -718,7 +718,7 @@ void emu_process_packet(unsigned char* mbus_msg, int msg_size)
{ /* seek to final position */
set_position(gEmu.time);
}
- else if (gEmu.set_state != EMU_PLAYING || gEmu.set_state != EMU_PAUSED)
+ else if (gEmu.set_state != EMU_PLAYING && gEmu.set_state != EMU_PAUSED)
{ /* was not playing yet, better send disk message */
diskmsg_dirty = true;
}