From 6baf56ca8c34528d12bd7b6afa16d13c8cd051ec Mon Sep 17 00:00:00 2001
From: deveee <deveee@178a84e3-b1eb-0310-8ba1-8eac791a3b58>
Date: Fri, 20 Sep 2013 07:43:01 +0000
Subject: [PATCH] Non-master players shouldn't quit the soccer setup screen

git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14113 178a84e3-b1eb-0310-8ba1-8eac791a3b58
---
 src/states_screens/soccer_setup_screen.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/states_screens/soccer_setup_screen.cpp b/src/states_screens/soccer_setup_screen.cpp
index 444420de7..b492301c4 100644
--- a/src/states_screens/soccer_setup_screen.cpp
+++ b/src/states_screens/soccer_setup_screen.cpp
@@ -219,11 +219,11 @@ GUIEngine::EventPropagation SoccerSetupScreen::filterActions(  PlayerAction acti
     }
     case PA_MENU_CANCEL:
     {
+        if (playerId != PLAYER_ID_GAME_MASTER) result = EVENT_BLOCK;
         if (!bt_continue->isFocusedForPlayer(PLAYER_ID_GAME_MASTER))
             return result;
 
         // Un-confirm team selection
-        // TODO: shouldn't trigger quitting the screen...
         for(int i=0 ; i < nb_players ; i++)
         {
             if(m_kart_view_info[i].local_player_id == playerId)