X-Git-Url: https://git.artsoft.org/?p=rocksndiamonds.git;a=blobdiff_plain;f=src%2Fscreens.c;h=5e0740b6366566b53340f5d1971412ee717941bf;hp=9deb974cc553d439dc8279ff8e45e61f22b5c28f;hb=6cf34a189f4a3707c9131652621dd67731f14f6b;hpb=a1c4feb3609b82ecfc843a1c49c7e5838753debd

diff --git a/src/screens.c b/src/screens.c
index 9deb974c..5e0740b6 100644
--- a/src/screens.c
+++ b/src/screens.c
@@ -3096,7 +3096,12 @@ void HandleInfoScreen_Music(int button)
     }
     else
     {
-      PlayMusic(list->music);
+      int music = list->music;
+
+      if (music_info[music].loop)
+	PlayMusicLoop(music);
+      else
+	PlayMusic(music);
 
       DrawTextSCentered(ystart, font_title, "The Game Background Music:");
     }
@@ -4630,16 +4635,17 @@ void HandleHallOfFame(int mx, int my, int dx, int dy, int button)
 
     FadeSound(SND_BACKGROUND_SCORES);
 
-    if (game_status_last_screen != GAME_MODE_PLAYING ||
-	!setup.auto_play_next_level || !setup.increment_levels)
+    if (game_status_last_screen == GAME_MODE_PLAYING &&
+	setup.auto_play_next_level && setup.increment_levels &&
+	!network_playing)
     {
-      SetGameStatus(GAME_MODE_MAIN);
-
-      DrawMainMenu();
+      StartGameActions(network.enabled, setup.autorecord, level.random_seed);
     }
     else
     {
-      StartGameActions(network.enabled, setup.autorecord, level.random_seed);
+      SetGameStatus(GAME_MODE_MAIN);
+
+      DrawMainMenu();
     }
   }