X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2Ftools.c;h=1230cf0ab482d1e455907ffba4c854c0677b48c8;hb=5df6c84e44cee231f11c2b886a9a73784bd10a54;hp=9bde54c7531aff5b7a1dc16d0e083808701f40d3;hpb=88a1829af8ca41b6e581f209002022b2483b86df;p=rocksndiamonds.git

diff --git a/src/tools.c b/src/tools.c
index 9bde54c7..1230cf0a 100644
--- a/src/tools.c
+++ b/src/tools.c
@@ -3777,12 +3777,10 @@ void WaitForEventToContinue()
 
   while (still_wait)
   {
-    if (PendingEvent())
-    {
-      Event event;
-
-      WaitEvent(&event);
+    Event event;
 
+    if (NextValidEvent(&event))
+    {
       switch (event.type)
       {
 	case EVENT_BUTTONPRESS:
@@ -8500,7 +8498,7 @@ void PlayMenuMusicExt(int music)
 void PlayMenuMusic()
 {
   char *curr_music = getCurrentlyPlayingMusicFilename();
-  char *next_music = getMusicListEntry(menu.music[game_status])->filename;
+  char *next_music = getMusicInfoEntryFilename(menu.music[game_status]);
 
   if (!strEqual(curr_music, next_music))
     PlayMenuMusicExt(menu.music[game_status]);
@@ -8520,7 +8518,7 @@ static void FadeMenuSounds()
 static void FadeMenuMusic()
 {
   char *curr_music = getCurrentlyPlayingMusicFilename();
-  char *next_music = getMusicListEntry(menu.music[game_status])->filename;
+  char *next_music = getMusicInfoEntryFilename(menu.music[game_status]);
 
   if (!strEqual(curr_music, next_music))
     FadeMusic();