X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2Ftape.c;h=fb705a9f9204bfea3fa3aaed7a6b27b5c9428cdf;hb=1442f47fb19411923cba74dd8a7c17fef1fe5e0d;hp=d3fdd45729a3bbd03f34a80020b7b281ffe965d2;hpb=98cdb3fce945485772ccc49741fa29051338ce0d;p=rocksndiamonds.git

diff --git a/src/tape.c b/src/tape.c
index d3fdd457..fb705a9f 100644
--- a/src/tape.c
+++ b/src/tape.c
@@ -962,7 +962,7 @@ byte *TapePlayAction()
 	DrawVideoDisplay(VIDEO_STATE_WARP2_ON, VIDEO_DISPLAY_SYMBOL_ONLY);
     }
 
-    if (TimePlayed > tape.length_seconds - TAPE_PAUSE_SECONDS_BEFORE_DEATH)
+    if (TapeTime > tape.length_seconds - TAPE_PAUSE_SECONDS_BEFORE_DEATH)
     {
       TapeTogglePause(TAPE_TOGGLE_MANUAL);
       return NULL;
@@ -1558,9 +1558,15 @@ static void HandleTapeButtons(struct GadgetInfo *gi)
 	}
 	else					/* AUTO PAUSE -> NORMAL PLAY */
 	{
+#if 1
+	  if (tape.warp_forward)
+	    TapeStopWarpForward();
+#else
+	  tape.warp_forward = FALSE;
+#endif
 	  tape.fast_forward = FALSE;
 	  tape.pause_before_death = FALSE;
-	  tape.warp_forward = FALSE;
+
 #if 1
 	  DrawVideoDisplay(VIDEO_STATE_PBEND_OFF | VIDEO_STATE_PLAY_ON, 0);
 #else