4rkal/monero
1
0
Fork 0
mirror of https://github.com/monero-project/monero.git synced 2024-12-13 11:56:31 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #5910

Browse Source 
1b91beb abstract_tcp_server2: fix lingering connections (moneromooo-monero)
This commit is contained in:
luigi1111 2019-09-30 18:55:58 -05:00
commit 15b9b4e047
No known key found for this signature in database
GPG Key ID: F4ACA0183641E010
1 changed files with 5 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
contrib/epee/include/net/abstract_tcp_server2.inl
View File

@ -748,6 +748,11 @@ PRAGMA_WARNING_DISABLE_VS(4355)
MERROR("Resetting timer on a dead object");
return;
}
if (m_was_shutdown)
{
MERROR("Setting timer on a shut down object");
return;
}
if (add)
ms += m_timer.expires_from_now();
m_timer.expires_from_now(ms);