From e2b58cfb982d6244106d1bc3648ce2feb529366a Mon Sep 17 00:00:00 2001
From: Asnivor <coding@asnitech.co.uk>
Date: Fri, 22 Jun 2018 13:43:26 +0100
Subject: [PATCH] ZXHawk: improvements to tape traps

---
 .../Hardware/Datacorder/DatacorderDevice.cs        | 14 +++++++++++++-
 1 file changed, 13 insertions(+), 1 deletion(-)

diff --git a/BizHawk.Emulation.Cores/Computers/SinclairSpectrum/Hardware/Datacorder/DatacorderDevice.cs b/BizHawk.Emulation.Cores/Computers/SinclairSpectrum/Hardware/Datacorder/DatacorderDevice.cs
index 8c69171110..23e09b6dba 100644
--- a/BizHawk.Emulation.Cores/Computers/SinclairSpectrum/Hardware/Datacorder/DatacorderDevice.cs
+++ b/BizHawk.Emulation.Cores/Computers/SinclairSpectrum/Hardware/Datacorder/DatacorderDevice.cs
@@ -847,7 +847,12 @@ namespace BizHawk.Emulation.Cores.Computers.SinclairSpectrum
 
                 if (_monitorTimeOut < 0)
                 {
-                    AutoStopTape();
+                    if (_dataBlocks[_currentDataBlockIndex].BlockDescription != BlockType.PAUSE_BLOCK &&
+                        _dataBlocks[_currentDataBlockIndex].BlockDescription != BlockType.PAUS)
+                    {
+                        AutoStopTape();
+                    }
+                    
                     return;
                 }
 
@@ -859,6 +864,13 @@ namespace BizHawk.Emulation.Cores.Computers.SinclairSpectrum
                 // get current datablock
                 var block = DataBlocks[_currentDataBlockIndex];
 
+                // is this a pause block?
+                if (block.BlockDescription == BlockType.PAUS || block.BlockDescription == BlockType.PAUSE_BLOCK)
+                {
+                    // dont autostop the tape here
+                    return;
+                }
+
                 // pause in ms at the end of the current block
                 int blockPause = block.PauseInMS;