From 6c2d3a83a5a6bd4c8ed8b0ab46989472e0ba6197 Mon Sep 17 00:00:00 2001
From: Tony Mountifield <tony@mountifield.org>
Date: Thu, 30 Jul 2026 23:26:47 +0100
Subject: [PATCH 1/2] When server list received, only start pings if timer not
 running

This avoids a double ping on startup due to receiving the reduced
server list and the normal server list in quick succession.
---
 src/connectdlg.cpp | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/src/connectdlg.cpp b/src/connectdlg.cpp
index 05127ded37..b145f60cf6 100644
--- a/src/connectdlg.cpp
+++ b/src/connectdlg.cpp
@@ -560,10 +560,14 @@ void CConnectDlg::SetServerList ( const CHostAddress& InetAddr, const CVector<CS
         }
     }
 
+    // only if the ping timer is not already running (avoids double ping):
     // immediately issue the ping measurements and start the ping timer since
     // the server list is filled now
-    OnTimerPing();
-    TimerPing.start ( PING_UPDATE_TIME_SERVER_LIST_MS );
+    if ( !TimerPing.isActive() )
+    {
+        OnTimerPing();
+        TimerPing.start ( PING_UPDATE_TIME_SERVER_LIST_MS );
+    }
 }
 
 void CConnectDlg::SetConnClientsList ( const CHostAddress& InetAddr, const CVector<CChannelInfo>& vecChanInfo )

From 1ea2d41715ab6ca1ae5450a0e245e2ecdfe67df2 Mon Sep 17 00:00:00 2001
From: Tony Mountifield <tony@mountifield.org>
Date: Fri, 31 Jul 2026 00:19:26 +0100
Subject: [PATCH 2/2] Stop ping timer when requesting a new server list

---
 src/connectdlg.cpp | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/src/connectdlg.cpp b/src/connectdlg.cpp
index b145f60cf6..468296205d 100644
--- a/src/connectdlg.cpp
+++ b/src/connectdlg.cpp
@@ -318,6 +318,9 @@ void CConnectDlg::showEvent ( QShowEvent* )
 
 void CConnectDlg::RequestServerList()
 {
+    // ensure ping timer is stopped
+    TimerPing.stop();
+
     // reset flags
     bServerListReceived        = false;
     bReducedServerListReceived = false;