From f16ed91bd5df18c832cc2d7fd1b6debc6d510adf Mon Sep 17 00:00:00 2001
From: Alayan-stk-2 <Alayan-stk-2@users.noreply.github.com>
Date: Sun, 15 Apr 2018 02:38:23 +0200
Subject: [PATCH] Go back to the overworld in losing challenges (#3192)

---
 src/states_screens/race_result_gui.cpp | 20 ++++++++++++++------
 1 file changed, 14 insertions(+), 6 deletions(-)

diff --git a/src/states_screens/race_result_gui.cpp b/src/states_screens/race_result_gui.cpp
index 8df14e439..922a22003 100644
--- a/src/states_screens/race_result_gui.cpp
+++ b/src/states_screens/race_result_gui.cpp
@@ -387,17 +387,25 @@ void RaceResultGUI::eventCallback(GUIEngine::Widget* widget,
         return;
     }
 
-    // This is a normal race, nothing was unlocked
-    // -------------------------------------------
     StateManager::get()->popMenu();
     if (name == "top")                 // Setup new race
     {
         race_manager->exitRace();
         race_manager->setAIKartOverride("");
-        Screen* newStack[] = { MainMenuScreen::getInstance(),
-                              RaceSetupScreen::getInstance(),
-                              NULL };
-        StateManager::get()->resetAndSetStack(newStack);
+
+        //If pressing continue quickly in a losing challenge
+        if (race_manager->raceWasStartedFromOverworld())
+        {
+            StateManager::get()->resetAndGoToScreen(MainMenuScreen::getInstance());
+            OverWorld::enterOverWorld();
+        }
+        else
+        {
+            Screen* newStack[] = { MainMenuScreen::getInstance(),
+                                  RaceSetupScreen::getInstance(),
+                                  NULL };
+            StateManager::get()->resetAndSetStack(newStack);
+        }
     }
     else if (name == "middle")        // Restart
     {