From 1994fba62b5a7967e0525621441116e209008595 Mon Sep 17 00:00:00 2001 From: hiker Date: Fri, 29 Mar 2019 08:23:05 +1100 Subject: [PATCH] Implemented the work around for #3671 (GP aborted if an unlock screen is shown between races). --- src/states_screens/race_result_gui.cpp | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) mode change 100644 => 100755 src/states_screens/race_result_gui.cpp diff --git a/src/states_screens/race_result_gui.cpp b/src/states_screens/race_result_gui.cpp old mode 100644 new mode 100755 index b0a874cb7..d5aa1a384 --- a/src/states_screens/race_result_gui.cpp +++ b/src/states_screens/race_result_gui.cpp @@ -182,7 +182,9 @@ void RaceResultGUI::enableAllButtons() // If something was unlocked // ------------------------- int n = (int)PlayerManager::getCurrentPlayer()->getRecentlyCompletedChallenges().size(); - if (n > 0) + if (n > 0 && + (race_manager->getMajorMode() != RaceManager::MAJOR_MODE_GRAND_PRIX || + race_manager->getTrackNumber() + 1 == race_manager->getNumOfTracks() ) ) { top->setText(n == 1 ? _("You completed a challenge!") : _("You completed challenges!")); @@ -289,7 +291,10 @@ void RaceResultGUI::eventCallback(GUIEngine::Widget* widget, // --------------------------------------------------------- int n = (int)PlayerManager::getCurrentPlayer() ->getRecentlyCompletedChallenges().size(); - if (n>0) + if (n > 0 && + (race_manager->getMajorMode() != RaceManager::MAJOR_MODE_GRAND_PRIX || + race_manager->getTrackNumber() + 1 == race_manager->getNumOfTracks() ) ) + { if (name == "top") {