Fix broken splitscreen network when no track selection screen

src/network/protocols/client_lobby.cpp

@@ -1092,8 +1092,9 @@ void ClientLobby::startSelection(Event* event)
     }
     // In case of auto-connect or continue a grand prix, use random karts
     // (or previous kart) from server and go to track selection
-    if ((NetworkConfig::get()->isAutoConnect() || skip_kart_screen) &&
+    if (NetworkConfig::get()->isAutoConnect())
-        m_server_enabled_track_voting)
+        skip_kart_screen = true;
+    if (skip_kart_screen)
     {
         input_manager->setMasterPlayerOnly(true);
         for (auto& p : NetworkConfig::get()->getNetworkPlayers())
@@ -1102,23 +1103,24 @@ void ClientLobby::startSelection(Event* event)
                 ->createActivePlayer(std::get<1>(p), std::get<0>(p));
         }
         input_manager->getDeviceManager()->setAssignMode(ASSIGN);
-        if (!GUIEngine::isNoGraphics())
+        NetworkingLobby::getInstance()->setAssignedPlayers(true);
+    }
+    if (!GUIEngine::isNoGraphics())
+    {
+        if (skip_kart_screen && m_server_enabled_track_voting)
         {
             TracksScreen::getInstance()->setQuitServer();
             TracksScreen::getInstance()->setNetworkTracks();
             TracksScreen::getInstance()->push();
         }
-    }
+        else if (!skip_kart_screen)
-    else if (!GUIEngine::isNoGraphics())
+        {
-    {
+            NetworkKartSelectionScreen::getInstance()->push();
-        NetworkKartSelectionScreen::getInstance()->push();
+        }
-    }
-
-    if (!GUIEngine::isNoGraphics())
-    {
         TracksScreen *ts = TracksScreen::getInstance();
         ts->resetVote();
     }
+
     m_state.store(SELECTING_ASSETS);
     Log::info("ClientLobby", "Selection starts now");
 }   // startSelection

src/states_screens/online/networking_lobby.cpp

@@ -179,6 +179,7 @@ void NetworkingLobby::init()
     m_player_names.clear();
     m_has_auto_start_in_server = false;
     m_client_live_joinable = false;
+    m_assigned_players = false;
     m_addon_install = NULL;
     m_ping_update_timer = 0;
     m_start_timeout = std::numeric_limits<float>::max();
@@ -883,7 +884,8 @@ void NetworkingLobby::tearDown()
     if (!NetworkConfig::get()->isClient())
         return;
     input_manager->getDeviceManager()->mapFireToSelect(false);
-    input_manager->getDeviceManager()->setAssignMode(NO_ASSIGN);
+    if (!m_assigned_players)
+        input_manager->getDeviceManager()->setAssignMode(NO_ASSIGN);
 }   // tearDown
 
 // ----------------------------------------------------------------------------

src/states_screens/online/networking_lobby.hpp

@@ -84,7 +84,7 @@ private:
 
     bool m_has_auto_start_in_server,
         m_server_configurable, m_client_live_joinable,
-        m_reload_server_info;
+        m_reload_server_info, m_assigned_players;
 
     Addon* m_addon_install;
     video::ITexture* m_config_texture;
@@ -148,6 +148,7 @@ public:
     void toggleServerConfigButton(bool val)    { m_server_configurable = val; }
     void reloadServerInfos()                   { m_reload_server_info = true; }
     void setHeader(const core::stringw& header)     { m_header_text = header; }
+    void setAssignedPlayers(bool val)             { m_assigned_players = val; }
 };   // class NetworkingLobby
 
 #endif