merged change from RC_0_16

This commit is contained in:
Arvid Norberg 2013-01-25 06:22:42 +00:00
parent 9ac63f9aba
commit a35c32bc51
2 changed files with 8 additions and 0 deletions

View File

@ -10,6 +10,7 @@
* fix uTP edge case where udp socket buffer fills up
* fix nagle implementation in uTP
* set_piece_deadline() also unfilters the piece (if its priority is 0)
* add work-around for bug in windows vista and earlier in GetOverlappedResult
* fix traversal algorithm leak in DHT
* fix string encoding conversions on windows

View File

@ -3721,6 +3721,9 @@ namespace libtorrent
std::iter_swap(i, boost::prior(i));
--i;
}
// just in case this piece had priority 0
if (m_picker->piece_priority(piece) == 0)
m_picker->set_piece_priority(piece, 1);
return;
}
@ -3735,6 +3738,10 @@ namespace libtorrent
, m_time_critical_pieces.end(), p);
m_time_critical_pieces.insert(i, p);
// just in case this piece had priority 0
if (m_picker->piece_priority(piece) == 0)
m_picker->set_piece_priority(piece, 1);
piece_picker::downloading_piece pi;
m_picker->piece_info(piece, pi);
if (pi.requested == 0) return;