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

diff --git a/src/tools.c b/src/tools.c
index 47c4b4f8..d3bfb74d 100644
--- a/src/tools.c
+++ b/src/tools.c
@@ -1064,7 +1064,8 @@ void FadeIn(int fade_mask)
 void FadeOut(int fade_mask)
 {
   // update screen if areas covered by "fade_mask" and "redraw_mask" differ
-  if (!equalRedrawMasks(fade_mask, redraw_mask))
+  if (!equalRedrawMasks(fade_mask, redraw_mask) &&
+      fade_type_skip != FADE_MODE_SKIP_FADE_OUT)
     BackToFront();
 
   SetScreenStates_BeforeFadingOut();
@@ -4332,6 +4333,12 @@ 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);