X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2Fscreens.c;h=ee5035ce0320569f35a9fb27e510a0123da9636d;hb=6ca233d4d71331460af0443bf5b307f16c6fe069;hp=28deabb99892e96178d62af3226efc7b0860ab44;hpb=31edc3255754f9fc39c652d28463a6d5884a6ee1;p=rocksndiamonds.git

diff --git a/src/screens.c b/src/screens.c
index 28deabb9..ee5035ce 100644
--- a/src/screens.c
+++ b/src/screens.c
@@ -4353,6 +4353,9 @@ static void DrawChooseTree(TreeInfo **ti_ptr)
   boolean restart_music = (game_status != game_status_last_screen &&
 			   game_status_last_screen != GAME_MODE_SCOREINFO);
 
+  scores.continue_on_return = (game_status == GAME_MODE_SCORES &&
+			       game_status_last_screen == GAME_MODE_PLAYING);
+
   if (CheckFadeAll())
     fade_mask = REDRAW_ALL;
 
@@ -4813,8 +4816,8 @@ static void HandleChooseTree(int mx, int my, int dx, int dy, int button,
   // directly continue when touching the screen after playing
   if ((mx || my) && scores.continue_on_return)
   {
+    // ignore touch events until released
     mx = my = 0;
-    button = MB_MENU_CHOICE;
   }
 #endif
 
@@ -5320,7 +5323,6 @@ static void DrawHallOfFame_setScoreEntries(void)
 void DrawHallOfFame(int nr)
 {
   scores.last_level_nr = nr;
-  scores.continue_on_return = (game_status_last_screen == GAME_MODE_PLAYING);
 
   // (this is needed when called from GameEnd() after winning a game)
   KeyboardAutoRepeatOn();