Synchronize changes from 1.6 master branch [ci skip]

f5aa603 Addendum #2 to 5429339 (Server list crash fixes)
13b8473 Update client en_US pot

Author: github-actions[bot]

Client/core/ServerBrowser/CServerBrowser.RemoteMasterServer.cpp

@@ -92,7 +92,9 @@ CRemoteMasterServer::~CRemoteMasterServer()
 void CRemoteMasterServer::Init(const SString& strURL)
 {
     m_strURL = strURL;
-    GetHTTP()->SetMaxConnections(5);
+    CNetHTTPDownloadManagerInterface* pHTTP = GetHTTP();
+    if (pHTTP)
+        pHTTP->SetMaxConnections(5);
 }
 
 ///////////////////////////////////////////////////////////////
@@ -120,12 +122,19 @@ void CRemoteMasterServer::Refresh()
     if (GetTickCount64_() - m_llLastRefreshTime < 60000 && m_strStage == "hasdata")
         return;
 
+    CNetHTTPDownloadManagerInterface* pHTTP = GetHTTP();
+    if (!pHTTP)
+    {
+        m_strStage = "nogood";
+        return;
+    }
+
     // Send new request
     m_strStage = "waitingreply";
     m_llLastRefreshTime = GetTickCount64_();
     SHttpRequestOptions options;
     options.uiConnectionAttempts = 1;
-    if (GetHTTP()->QueueFile(m_strURL, NULL, this, &CRemoteMasterServer::StaticDownloadFinished, options))
+    if (pHTTP->QueueFile(m_strURL, NULL, this, &CRemoteMasterServer::StaticDownloadFinished, options))
     {
         m_bPendingDownload = true;
         AddRef();            // Keep alive
@@ -141,7 +150,17 @@ void CRemoteMasterServer::Cancel()
     if (!m_bPendingDownload)
         return;
 
-    if (GetHTTP()->CancelDownload(this, &CRemoteMasterServer::StaticDownloadFinished))
+    CNetHTTPDownloadManagerInterface* pHTTP = GetHTTP();
+    if (!pHTTP)
+    {
+        // HTTP manager destroyed - callback won't be called, so Release() here
+        m_bPendingDownload = false;
+        m_strStage.clear();
+        Release();
+        return;
+    }
+
+    if (pHTTP->CancelDownload(this, &CRemoteMasterServer::StaticDownloadFinished))
     {
         m_bPendingDownload = false;
         m_strStage.clear();
@@ -200,7 +219,9 @@ void CRemoteMasterServer::DownloadFinished(const SHttpDownloadResult& result)
 ///////////////////////////////////////////////////////////////
 bool CRemoteMasterServer::HasData()
 {
-    GetHTTP()->ProcessQueuedFiles();
+    CNetHTTPDownloadManagerInterface* pHTTP = GetHTTP();
+    if (pHTTP)
+        pHTTP->ProcessQueuedFiles();
     return m_strStage == "hasdata";
 }
 

Client/core/ServerBrowser/CServerBrowser.cpp

@@ -374,6 +374,11 @@ CServerBrowser::CServerBrowser()
 
 CServerBrowser::~CServerBrowser()
 {
+    // Suspend all server list activity and cancel pending network operations FIRST
+    // This must be done before DeleteTab() destroys the server lists, and while
+    // the network subsystem is still available (it may be destroyed before this destructor)
+    SuspendServerLists();
+
     // Save options now and disable selection handler
     SaveOptions(true);
     if (m_pPanel)
@@ -992,6 +997,13 @@ void CServerBrowser::StartRefresh(ServerBrowserType type)
 
         m_iSelectedServer[index] = -1;
         m_bPendingRefresh[index] = false;
+        
+        // Cancel any in-progress batch refresh to prevent iterator invalidation
+        // when pList->Refresh() calls Clear() on the server list
+        m_ListRefreshState[index].bActive = false;
+        m_ListRefreshState[index].pList = nullptr;
+        m_ListRefreshState[index].filterSnapshot.reset();
+        
         pList->Refresh();
         m_bInitialRefreshDone[index] = true;
     }