X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2Ftools.c;h=52fbded05846a88125e503994a8f6439555851a4;hb=b844b9ff4b1c79c5789cdae0a90deacb88d0887a;hp=67bb1795a766b963738122a3bf1d9c96fe172b9d;hpb=d4c19f2f629758803f62f52809c889052ddf3ccf;p=rocksndiamonds.git

diff --git a/src/tools.c b/src/tools.c
index 67bb1795..52fbded0 100644
--- a/src/tools.c
+++ b/src/tools.c
@@ -971,19 +971,13 @@ static void FadeExt(int fade_mask, int fade_mode, int fade_type)
     height = WIN_YSIZE;
   }
 
-  if (!setup.fade_screens ||
-      fade_delay == 0 ||
-      fading.fade_mode == FADE_MODE_NONE)
-  {
-    if (fade_mode == FADE_MODE_FADE_OUT)
-      return;
-
-    BlitBitmap(backbuffer, window, x, y, width, height, x, y);
-
-    redraw_mask &= ~fade_mask;
+  // when switching screens without fading, set fade delay to zero
+  if (!setup.fade_screens || fading.fade_mode == FADE_MODE_NONE)
+    fade_delay = 0;
 
+  // do not display black frame when fading out without fade delay
+  if (fade_mode == FADE_MODE_FADE_OUT && fade_delay == 0)
     return;
-  }
 
   FadeRectangle(x, y, width, height, fade_mode, fade_delay, post_delay,
 		draw_border_function);