From 647cda2934c6ae20e92729475447819c0f96ca57 Mon Sep 17 00:00:00 2001 From: Arvid Norberg Date: Fri, 6 Jun 2014 15:27:44 +0000 Subject: [PATCH] merge streaming fix from libtorrent_aio --- src/torrent.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/torrent.cpp b/src/torrent.cpp index 56c0b00e8..f3c42853f 100644 --- a/src/torrent.cpp +++ b/src/torrent.cpp @@ -3714,7 +3714,7 @@ namespace libtorrent , end(dq.end()); k != end; ++k) { if (time_critical.count(k->block.piece_index)) continue; - if (k->not_wanted) continue; + if (k->not_wanted || k->timed_out) continue; p->cancel_request(k->block, true); } @@ -7891,7 +7891,7 @@ namespace libtorrent } #endif // TORRENT_DEBUG_STREAMING - if (!m_time_critical_pieces.empty()) + if (!m_time_critical_pieces.empty() && !upload_mode()) { request_time_critical_pieces(); }