diff options
| author | luigi1111 <luigi1111w@gmail.com> | 2019-09-30 18:55:58 -0500 |
|---|---|---|
| committer | luigi1111 <luigi1111w@gmail.com> | 2019-09-30 18:55:58 -0500 |
| commit | 15b9b4e047354318544366a357a812e715b3ea3a (patch) | |
| tree | fdd2a56bb77c97f355dd24855afc9bece2506fd7 /contrib | |
| parent | Merge pull request #5908 (diff) | |
| parent | abstract_tcp_server2: fix lingering connections (diff) | |
| download | monero-15b9b4e047354318544366a357a812e715b3ea3a.tar.xz | |
Merge pull request #5910
1b91beb abstract_tcp_server2: fix lingering connections (moneromooo-monero)
Diffstat (limited to 'contrib')
| -rw-r--r-- | contrib/epee/include/net/abstract_tcp_server2.inl | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/contrib/epee/include/net/abstract_tcp_server2.inl b/contrib/epee/include/net/abstract_tcp_server2.inl index 240ef3bc4..e455d0204 100644 --- a/contrib/epee/include/net/abstract_tcp_server2.inl +++ b/contrib/epee/include/net/abstract_tcp_server2.inl @@ -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); |