merged fix from RC_0_16

This commit is contained in:
Arvid Norberg 2013-10-27 23:56:45 +00:00
parent aa4064316e
commit 146fee37e9
2 changed files with 2 additions and 1 deletions

View File

@ -25,6 +25,7 @@
* fix uTP edge case where udp socket buffer fills up * fix uTP edge case where udp socket buffer fills up
* fix nagle implementation in uTP * fix nagle implementation in uTP
* graceful pause fix
* i2p fixes * i2p fixes
* fix issue when loading certain malformed .torrent files * fix issue when loading certain malformed .torrent files
* pass along host header with http proxy requests and possible http_connection shutdown hang * pass along host header with http proxy requests and possible http_connection shutdown hang

View File

@ -7782,7 +7782,7 @@ namespace libtorrent
set_upload_mode(false); set_upload_mode(false);
} }
if (is_paused()) if (is_paused() && !m_graceful_pause_mode)
{ {
// let the stats fade out to 0 // let the stats fade out to 0
accumulator += m_stat; accumulator += m_stat;