Skip to content

When server list received, only start pings if timer not running #3847

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
softins merged 2 commits into from
Jul 31, 2026
+9 −2
Merged

When server list received, only start pings if timer not running #3847

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
6c2d3a8
When server list received, only start pings if timer not running
softins Jul 30, 2026
1ea2d41
Stop ping timer when requesting a new server list
softins Jul 30, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 9 additions & 2 deletions src/connectdlg.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -318,6 +318,9 @@ void CConnectDlg::showEvent ( QShowEvent* )

void CConnectDlg::RequestServerList()
{
// ensure ping timer is stopped
TimerPing.stop();

// reset flags
bServerListReceived = false;
bReducedServerListReceived = false;
Expand Down Expand Up @@ -560,10 +563,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 )
Expand Down
Loading