From: Holger Schemel <info@artsoft.org>
Date: Sun, 15 May 2022 08:47:41 +0000 (+0200)
Subject: fixed bug with leaving scores screen on Android platform (again)
X-Git-Tag: 4.3.2.2~22
X-Git-Url: https://git.artsoft.org/?p=rocksndiamonds.git;a=commitdiff_plain;h=253688c723334738297ec82a5256c76ed55efe5e

fixed bug with leaving scores screen on Android platform (again)

This is the same bugfix as in commit a42f3002 (which for whatever
reason was "unfixed" since that commit).
---

diff --git a/src/screens.c b/src/screens.c
index 28deabb9..98cb6ba9 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;
 
@@ -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();