X-Git-Url: https://git.artsoft.org/?p=rocksndiamonds.git;a=blobdiff_plain;f=src%2Fgame.c;h=d517cdc06587c182cfb5f522b6beddb064dc4af1;hp=9197a84aabf755f9e049e39f81ec22827612d20d;hb=64f0d273ab910b98d1c929bad3146aeccfd6468a;hpb=9f40d091d5c9e5104fa90c881b6cb8ab8470d71d

diff --git a/src/game.c b/src/game.c
index 9197a84a..d517cdc0 100644
--- a/src/game.c
+++ b/src/game.c
@@ -3358,7 +3358,7 @@ void InitGame(void)
   else
     FadeSetEnterScreen();
 
-  if (CheckIfGlobalBorderOrPlayfieldViewportHasChanged())
+  if (CheckFadeAll())
     fade_mask = REDRAW_ALL;
 
   FadeLevelSoundsAndMusic();
@@ -14973,7 +14973,12 @@ void RequestQuitGameExt(boolean skip_request, boolean quick_quit, char *message)
   {
     // closing door required in case of envelope style request dialogs
     if (!skip_request)
+    {
+      // prevent short reactivation of overlay buttons while closing door
+      SetOverlayActive(FALSE);
+
       CloseDoor(DOOR_CLOSE_1);
+    }
 
     if (network.enabled)
       SendToServer_StopPlaying(NETWORK_STOP_BY_PLAYER);