fixed fading complete screen if playfield viewport has changed

[rocksndiamonds.git] / src / game.c

diff --git a/src/game.c b/src/game.c
index e5e128f8539c9158c916effcb0802c2a015326c6..1de51be5b909b1e0cc2b0f735fa0e7f989fc7771 100644 (file)
--- a/src/game.c
+++ b/src/game.c
@@ -3298,7 +3298,7 @@ void InitGame()
   else
     FadeSetEnterScreen();
 
-  if (CheckIfGlobalBorderHasChanged())
+  if (CheckIfGlobalBorderOrPlayfieldViewportHasChanged())
     fade_mask = REDRAW_ALL;
 
   FadeLevelSoundsAndMusic();
@@ -15787,7 +15787,8 @@ static void HandleGameButtonsExt(int id, int button)
 
        SetAudioMode(setup.sound);
 
-       PlayLevelMusic();
+       if (game_status == GAME_MODE_PLAYING)
+         PlayLevelMusic();
       }
 
       RedrawSoundButtonGadget(id);