Ticket #3244: t3244_keep_player_selection_r16665.patch

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

@@ -1 +1 @@
 var g_ChatMessages = [];
 var g_Name = "unknown";
 var g_GameList = {};
+var g_selectedNick = "";
 var g_specialKey = Math.random();
 // This object looks like {"name":[numMessagesSinceReset, lastReset, timeBlocked]} when in use.
 var g_spamMonitor = {};
 var g_timestamp = Engine.ConfigDB_GetValue("user", "lobby.chattimestamp") == "true";
 var g_mapSizes = {};
@@ -154 +155 @@
  * @return Array containing the player, presence, nickname, and rating listings.
  */
 function updatePlayerList()
 {
     var playersBox = Engine.GetGUIObjectByName("playersBox");
+    
+    if (playersBox.selected > -1)
+        g_selectedNick = playersBox.list[playersBox.selected];
+        
     var playerList = [];
     var presenceList = [];
     var nickList = [];
     var ratingList = [];
     var cleanPlayerList = Engine.GetPlayerList();
@@ -189 +194 @@
     }
     playersBox.list_name = playerList;
     playersBox.list_status = presenceList;
     playersBox.list_rating = ratingList;
     playersBox.list = nickList;
-    if (playersBox.selected >= playersBox.list.length)
-        playersBox.selected = -1;
+    
+    // Select the previously selected player
+    playersBox.selected = nickList.indexOf(g_selectedNick);
+    
     return [playerList, presenceList, nickList, ratingList];
 }
 
 /**
  * Display the profile of the selected player.
@@ -627 +634 @@
             var playerList = playersBox.list_name;
             var presenceList = playersBox.list_status;
             var nickList = playersBox.list;
             var ratingList = playersBox.list_rating;
             var nickIndex = nickList.indexOf(nick);
+
+            if (playersBox.selected > -1)
+                g_selectedNick = nickList[playersBox.selected];
+
             switch(message.level)
             {
             case "join":
                 if (nick == g_Name)
                 {
@@ -662 +673 @@
                 addChatMessage({ "text": "/special " + sprintf(translate("%(nick)s has left."), { nick: nick }), "key": g_specialKey });
                 break;
             case "nick":
                 if (nickIndex == -1) // This shouldn't ever happen
                     break;
+                
                 if (!isValidNick(message.data))
                 {
                     addChatMessage({ "from": "system", "text": sprintf(translate("Invalid nickname: %(nick)s"), { nick: message.data })});
                     break;
                 }
@@ -694 +706 @@
             // Push new data to GUI
             playersBox.list_name = playerList;
             playersBox.list_status = presenceList;
             playersBox.list_rating = ratingList;
             playersBox.list = nickList;     
-            if (playersBox.selected >= playersBox.list.length)
-                playersBox.selected = -1;
+            // Select the previously selected player
+            playersBox.selected = nickList.indexOf(g_selectedNick);
             break;
         case "system":
             switch (message.level)
             {
             case "standard":