From f856a8ad65de2f1ebac34272dc081a53ea0df692 Mon Sep 17 00:00:00 2001
From: Connor McLaughlin <stenzek@gmail.com>
Date: Sun, 31 May 2020 17:03:13 +1000
Subject: [PATCH] CDROM: Ignore pending setloc after read/play

Fixes games which send a second Setloc after reading, e.g. Army Men -
Sarge's Heroes.
---
 src/core/cdrom.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/core/cdrom.cpp b/src/core/cdrom.cpp
index b51deeba8..a1a2ebce1 100644
--- a/src/core/cdrom.cpp
+++ b/src/core/cdrom.cpp
@@ -1496,7 +1496,7 @@ void CDROM::BeginReading(TickCount ticks_late /* = 0 */, bool after_seek /* = fa
   Log_DebugPrintf("Starting reading @ LBA %u", m_current_lba);
   ClearSectorBuffers();
 
-  if (m_setloc_pending)
+  if (!after_seek && m_setloc_pending)
   {
     BeginSeeking(true, true, false);
     return;