Ticket #3244: t3244_keep_gamelist_selection_r16665.patch

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

@@ -2 +2 @@
 var g_Name = "unknown";
 var g_GameList = {};
 var g_specialKey = Math.random();
 // This object looks like {"name":[numMessagesSinceReset, lastReset, timeBlocked]} when in use.
 var g_spamMonitor = {};
+var g_selectedGameIP = "";
 var g_timestamp = Engine.ConfigDB_GetValue("user", "lobby.chattimestamp") == "true";
 var g_mapSizes = {};
 const g_mapTypesText = [translateWithContext("map", "Skirmish"), translateWithContext("map", "Random"), translate("Scenario")];
 const g_mapTypes = ["skirmish", "random", "scenario"];
 var g_userRating = ""; // Rating of user, defaults to Unrated
@@ -356 +357 @@
  */
 function updateGameList()
 {
     var gamesBox = Engine.GetGUIObjectByName("gamesBox");
     var gameList = Engine.GetGameList();
+    if (gamesBox.selected > -1)
+        g_selectedGameIP = g_GameList[gamesBox.selected].ip;
+    
     // Store the game whole game list data so that we can access it later
     // to update the game info panel.
     g_GameList = gameList;
 
     // Sort the list of games to that games 'waiting' are displayed at the top, followed by 'init', followed by 'running'.
@@ -385 +389 @@
     var list_mapType = [];
     var list_nPlayers = [];
     var list = [];
     var list_data = [];
 
+    var selectedIndex = -1;
     var c = 0;
     for each (var g in gameList)
     {
         if(!filterGame(g))
         {
@@ -400 +405 @@
                 name = '[color="255 127 0"]' + name + '[/color]';
             else
                 name = '[color="255 0 0"]' + name + '[/color]';
             list_name.push(name);
             list_ip.push(g.ip);
+            if (g.ip == g_selectedGameIP)
+                selectedIndex = list_ip.length - 1;
+
             list_mapName.push(translate(g.niceMapName));
             list_mapSize.push(translatedMapSize(g.mapSize));
             let idx = g_mapTypes.indexOf(g.mapType);
             list_mapType.push(idx != -1 ? g_mapTypesText[idx] : "");
             list_nPlayers.push(g.nbp + "/" +g.tnbp);
@@ -419 +427 @@
     gamesBox.list_mapType = list_mapType;
     gamesBox.list_nPlayers = list_nPlayers;
     gamesBox.list = list;
     gamesBox.list_data = list_data;
 
-    if (gamesBox.selected >= gamesBox.list_name.length)
-        gamesBox.selected = -1;
-
+    // Select previously selected game
+    gamesBox.selected = selectedIndex;
+    
     // Update info box about the game currently selected
     updateGameSelection();
 }
 
 /**