Fix broken network kart selection for some keyboard configuration

src/states_screens/kart_selection.cpp

@@ -376,6 +376,11 @@ void KartSelectionScreen::init()
     else */
     // For now this is what will happen
     input_manager->getDeviceManager()->setAssignMode(DETECT_NEW);
+    // This flag will cause that a 'fire' event will be mapped to 'select' (if
+    // 'fire' is not assigned to a GUI event). This is done to support the old
+    // way of player joining by pressing 'fire' instead of 'select'.
+    input_manager->getDeviceManager()->mapFireToSelect(true);
+
     if (!NetworkConfig::get()->isNetworking())
     {
         if (!m_multiplayer)
@@ -396,10 +401,6 @@ void KartSelectionScreen::init()
             // Add multiplayer message
             addMultiplayerMessage();
         }
-        // This flag will cause that a 'fire' event will be mapped to 'select' (if
-        // 'fire' is not assigned to a GUI event). This is done to support the old
-        // way of player joining by pressing 'fire' instead of 'select'.
-        input_manager->getDeviceManager()->mapFireToSelect(true);
     }
 }   // init
 

src/states_screens/network_kart_selection.cpp

@@ -36,9 +36,6 @@ void NetworkKartSelectionScreen::init()
     m_multiplayer = NetworkConfig::get()->getNetworkPlayers().size() != 1;
     KartSelectionScreen::init();
 
-    RibbonWidget* tabs = getWidget<RibbonWidget>("kartgroups");
-    assert(tabs != NULL);
-
     // change the back button image (because it makes the game quit)
     IconButtonWidget* back_button = getWidget<IconButtonWidget>("back");
     back_button->setImage("gui/main_quit.png");

src/states_screens/network_kart_selection.hpp

@@ -54,6 +54,7 @@ public:
     // ------------------------------------------------------------------------
     virtual bool playerQuit(StateManager::ActivePlayer* player) OVERRIDE
                                                                { return true; }
+    // ------------------------------------------------------------------------
      /** \brief implement callback from parent class GUIEngine::Screen */
     virtual void tearDown() OVERRIDE
     {