From f175ed866dcbde7235f6b1edb0ab5ebbf313e868 Mon Sep 17 00:00:00 2001
From: aurhat <6187373+aurhat@users.noreply.github.com>
Date: Tue, 19 Oct 2021 23:37:48 +0200
Subject: [PATCH] fix showing player names in serverbrowser

Earlier the player names weren't displayed for a server on the top, if user
didn't change server selection after opening the serverbrowser.
---
 source/src/serverbrowser.cpp | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/source/src/serverbrowser.cpp b/source/src/serverbrowser.cpp
index fd86ab4d..106e320e 100644
--- a/source/src/serverbrowser.cpp
+++ b/source/src/serverbrowser.cpp
@@ -1104,9 +1104,10 @@ void refreshservers(void *menu, bool init)
                 {
                     ((gmenu *)menu)->menusel = ((gmenu *)menu)->items.length() - 1;
                     usedselect = true;
-                    if(shownamesinbrowser) si.getinfo = EXTPING_NAMELIST;
                 }
-                if((shownamesinbrowser && servers[i] == oldsel && si.playernames.length()) || issearch)
+                bool showplayernames = shownamesinbrowser && !issearch && (servers[i] == oldsel || (((gmenu *)menu)->menusel == 0 && servers[i] == lastselectedserver));
+                if(showplayernames) si.getinfo = EXTPING_NAMELIST;
+                if((showplayernames && si.playernames.length()) || issearch)
                 {
                     int cur = 0;
                     char *t = NULL;