X-Git-Url: https://git.artsoft.org/?p=rocksndiamonds.git;a=blobdiff_plain;f=src%2Ftools.c;h=0817e3d864e656b081d0a6658a5ed4774402dd47;hp=d3bfb74dd9385fde17716522aaf9555247ce42be;hb=57df78d466cba1424ee144e4d886da8fcff74833;hpb=82bcb06cd720a1c893858af861cbddfaa607073a

diff --git a/src/tools.c b/src/tools.c
index d3bfb74d..0817e3d8 100644
--- a/src/tools.c
+++ b/src/tools.c
@@ -2846,7 +2846,7 @@ void ShowEnvelope(int envelope_nr)
   AnimateEnvelope(envelope_nr, main_anim_mode, ACTION_OPENING);
 
   if (tape.playing)
-    Delay(wait_delay_value);
+    Delay_WithScreenUpdates(wait_delay_value);
   else
     WaitForEventToContinue();
 
@@ -4333,12 +4333,6 @@ static int RequestHandleEvents(unsigned int req_state)
 		button_status = MB_RELEASED;
 	    }
 
-	    if (HandleGlobalAnimClicks(mx, my, button_status, FALSE))
-	    {
-	      // do not handle this button event anymore
-	      continue;		// force mouse event not to be handled at all
-	    }
-
 	    // this sets 'request_gadget_id'
 	    HandleGadgets(mx, my, button_status);
 
@@ -4368,6 +4362,8 @@ static int RequestHandleEvents(unsigned int req_state)
 		break;
 
 	      default:
+		// only check clickable animations if no request gadget clicked
+		HandleGlobalAnimClicks(mx, my, button_status, FALSE);
 		break;
 	    }