X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2Ftape.c;h=d6c538d9dfd9b6191c180742b993bb2fbed3a8e6;hb=584c5950f79b9d0abbc4698f96dcfeffa64a786a;hp=ff5f6199ef6f5c482e5d75d8cbb32a644a92b71a;hpb=bc1cfd142117805ee16aadb9143aa9c8980cf94e;p=rocksndiamonds.git

diff --git a/src/tape.c b/src/tape.c
index ff5f6199..d6c538d9 100644
--- a/src/tape.c
+++ b/src/tape.c
@@ -691,20 +691,20 @@ void TapeTogglePause(boolean toggle_manual)
     {
       DrawVideoDisplaySymbol(VIDEO_STATE_WARP2_ON);
     }
+  }
 
-    if (tape.quick_resume)
-    {
-      tape.quick_resume = FALSE;
+  if (tape.quick_resume)
+  {
+    tape.quick_resume = FALSE;
 
-      TapeStopWarpForward();
-      TapeAppendRecording();
+    TapeStopWarpForward();
+    TapeAppendRecording();
 
-      if (!CheckEngineSnapshotSingle())
-	SaveEngineSnapshotSingle();
+    if (!CheckEngineSnapshotSingle())
+      SaveEngineSnapshotSingle();
 
-      // restart step/move snapshots after quick loading tape
-      SaveEngineSnapshotToListInitial();
-    }
+    // restart step/move snapshots after quick loading tape
+    SaveEngineSnapshotToListInitial();
   }
 
   if (setup.show_snapshot_buttons &&
@@ -785,6 +785,16 @@ byte *TapePlayAction()
     }
   }
 
+  if (tape.counter >= tape.length)	/* end of tape reached */
+  {
+    if (tape.warp_forward && !tape.auto_play)
+      TapeTogglePause(TAPE_TOGGLE_MANUAL);
+    else
+      TapeStop();
+
+    return NULL;
+  }
+
   if (update_video_display && !tape.deactivate_display)
   {
     if (tape.pause_before_end)
@@ -796,16 +806,6 @@ byte *TapePlayAction()
       DrawVideoDisplaySymbol(VIDEO_STATE_WARP2_ON);
   }
 
-  if (tape.counter >= tape.length)	/* end of tape reached */
-  {
-    if (tape.warp_forward && !tape.auto_play)
-      TapeTogglePause(TAPE_TOGGLE_MANUAL);
-    else
-      TapeStop();
-
-    return NULL;
-  }
-
   for (i = 0; i < MAX_PLAYERS; i++)
     action[i] = tape.pos[tape.counter].action[i];