X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2Fscreens.c;h=1a40ae7cb291fbe96c9914acad764fed22ee0d0a;hb=298cffce2845fea10a2f0420a26db13ea9179e57;hp=851e0a55277d93d1b744a55bd5cb284bbdd7b352;hpb=e802a9609c8b94b3aa720d28acab5c4240fc996f;p=rocksndiamonds.git

diff --git a/src/screens.c b/src/screens.c
index 851e0a55..1a40ae7c 100644
--- a/src/screens.c
+++ b/src/screens.c
@@ -4662,6 +4662,7 @@ void HandleHallOfFame(int mx, int my, int dx, int dy, int button)
 
     if (game_status_last_screen == GAME_MODE_PLAYING &&
 	setup.auto_play_next_level && setup.increment_levels &&
+	level_nr < leveldir_current->last_level &&
 	!network_playing)
     {
       StartGameActions(network.enabled, setup.autorecord, level.random_seed);
@@ -8210,9 +8211,15 @@ void HandleSetupScreen(int mx, int my, int dx, int dy, int button)
 
 void HandleGameActions(void)
 {
+  CheckGameOver();
+
   if (game.restart_game_message != NULL)
+  {
     RequestRestartGame(game.restart_game_message);
 
+    return;
+  }
+
   if (game_status != GAME_MODE_PLAYING)
     return;