X-Git-Url: https://git.artsoft.org/?p=rocksndiamonds.git;a=blobdiff_plain;f=src%2Fgame.c;h=1de51be5b909b1e0cc2b0f735fa0e7f989fc7771;hp=e5e128f8539c9158c916effcb0802c2a015326c6;hb=5c6c42f1;hpb=9dc1a9b929ed268df501e7d2b00f51f4521f8b5e

diff --git a/src/game.c b/src/game.c
index e5e128f8..1de51be5 100644
--- 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);