added variable to store if request dialog is active or opening/closing

[rocksndiamonds.git] / src / tools.c

diff --git a/src/tools.c b/src/tools.c
index a042e88fe91f7c84bcb914da569720cd63036612..8a2d895a8d65d5778a2e0bc9310c141a070ef2af 100644 (file)
--- a/src/tools.c
+++ b/src/tools.c
@@ -4804,6 +4804,8 @@ boolean Request(char *text, unsigned int req_state)
   boolean overlay_enabled = GetOverlayEnabled();
   boolean result;
 
+  game.request_active_or_moving = TRUE;
+
   SetOverlayEnabled(FALSE);
 
   if (global.use_envelope_request)
@@ -4813,6 +4815,8 @@ boolean Request(char *text, unsigned int req_state)
 
   SetOverlayEnabled(overlay_enabled);
 
+  game.request_active_or_moving = FALSE;
+
   return result;
 }
 
@@ -9097,7 +9101,7 @@ boolean CheckSingleStepMode_EM(byte action[MAX_PLAYERS], int frame,
                               boolean any_player_dropping)
 {
   if (tape.single_step && tape.recording && !tape.pausing)
-    if (frame == 7 && !any_player_dropping)
+    if (frame == 7 && !any_player_dropping && FrameCounter > 6)
       TapeTogglePause(TAPE_TOGGLE_AUTOMATIC);
 
   CheckSaveEngineSnapshot_EM(action, frame, any_player_moving,