Ticket #3388: t3388_add_comment.diff

binaries/data/mods/public/gui/lobby/lobby.js

@@ -22 +22 @@
 function init(attribs)
 {
     // Play menu music
     initMusic();
     global.music.setState(global.music.states.MENU);
 
     g_Name = Engine.LobbyGetNick();
 
     g_mapSizes = initMapSizes();
     g_mapSizes.shortNames.splice(0, 0, translateWithContext("map size", "Any"));
     g_mapSizes.tiles.splice(0, 0, "");
 
     var mapSizeFilter = Engine.GetGUIObjectByName("mapSizeFilter");
     mapSizeFilter.list = g_mapSizes.shortNames;
     mapSizeFilter.list_data = g_mapSizes.tiles;
 
     // Setup number-of-players filter
     var playersArray = Array(g_MaxPlayers).fill(0).map((v, i) => i + 1); // 1, 2, ... MaxPlayers
     var playersNumberFilter = Engine.GetGUIObjectByName("playersNumberFilter");
     playersNumberFilter.list = [translateWithContext("player number", "Any")].concat(playersArray);
     playersNumberFilter.list_data = [""].concat(playersArray);
 
     var mapTypeFilter = Engine.GetGUIObjectByName("mapTypeFilter");
     mapTypeFilter.list = [translateWithContext("map", "Any")].concat(g_mapTypesText);
     mapTypeFilter.list_data = [""].concat(g_mapTypes);
 
+    // This call also ensures that we load the correct playerlist after joining initially,
+    // since we didn't finish downloading the playerlist when updatePlayerList() is called below.
     Engine.LobbySetPlayerPresence("available");
+
     Engine.SendGetGameList();
     Engine.SendGetBoardList();
 
     // When rejoining the lobby after a game, we don't need to process presence changes
     Engine.LobbyClearPresenceUpdates();
     updatePlayerList();
 
     updateSubject(Engine.LobbyGetRoomSubject());
 
     resetFilters();
 }
 
 ////////////////////////////////////////////////////////////////////////////////////////////////
 // Xmpp client connection management
 ////////////////////////////////////////////////////////////////////////////////////////////////
 
 
 function lobbyStop()
 {
     Engine.StopXmppClient();
 }
 
 function lobbyConnect()
 {
     Engine.ConnectXmppClient();
 }