From 4838a1eb2fb4477f50810d2de02d3a597621dc7e Mon Sep 17 00:00:00 2001
From: auria <auria@178a84e3-b1eb-0310-8ba1-8eac791a3b58>
Date: Fri, 7 Dec 2012 00:24:20 +0000
Subject: [PATCH] Clear AI-override when appropriate, fixing #829

git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@12198 178a84e3-b1eb-0310-8ba1-8eac791a3b58
---
 src/states_screens/dialogs/race_paused_dialog.cpp | 1 +
 src/states_screens/race_result_gui.cpp            | 4 ++++
 2 files changed, 5 insertions(+)

diff --git a/src/states_screens/dialogs/race_paused_dialog.cpp b/src/states_screens/dialogs/race_paused_dialog.cpp
index 35dd621ec..20b9bac62 100644
--- a/src/states_screens/dialogs/race_paused_dialog.cpp
+++ b/src/states_screens/dialogs/race_paused_dialog.cpp
@@ -121,6 +121,7 @@ GUIEngine::EventPropagation
         {
             ModalDialog::dismiss();
             race_manager->exitRace();
+            race_manager->setAIKartOverride("");
             StateManager::get()->resetAndGoToScreen(MainMenuScreen::getInstance());
 
             if (race_manager->raceWasStartedFromOverworld())
diff --git a/src/states_screens/race_result_gui.cpp b/src/states_screens/race_result_gui.cpp
index 053763562..3f07d51fb 100644
--- a/src/states_screens/race_result_gui.cpp
+++ b/src/states_screens/race_result_gui.cpp
@@ -205,6 +205,7 @@ void RaceResultGUI::eventCallback(GUIEngine::Widget* widget,
                 StateManager::get()->popMenu();
                 World::deleteWorld();
                 StateManager::get()->pushScreen(scene);
+                race_manager->setAIKartOverride("");
             }
             return;
         }
@@ -228,6 +229,7 @@ void RaceResultGUI::eventCallback(GUIEngine::Widget* widget,
             cleanupGPProgress();
             StateManager::get()->popMenu();
             race_manager->exitRace();
+            race_manager->setAIKartOverride("");
             StateManager::get()->resetAndGoToScreen(
                                                 MainMenuScreen::getInstance());
             
@@ -251,6 +253,7 @@ void RaceResultGUI::eventCallback(GUIEngine::Widget* widget,
     if(name=="top")                 // Setup new race
     {
         race_manager->exitRace();
+        race_manager->setAIKartOverride("");
         Screen* newStack[] = {MainMenuScreen::getInstance(), 
                               RaceSetupScreen::getInstance(), 
                               NULL};
@@ -263,6 +266,7 @@ void RaceResultGUI::eventCallback(GUIEngine::Widget* widget,
     else if (name=="bottom")        // Back to main
     {
         race_manager->exitRace();
+        race_manager->setAIKartOverride("");
         StateManager::get()->resetAndGoToScreen(MainMenuScreen::getInstance());
         
         if (race_manager->raceWasStartedFromOverworld())