premiere
/
premiere-libtorrent
2
2
Fork 1
Code Issues Pull Requests Releases Wiki Activity

more attempts to fix and catch invariant failure in download_queue

This commit is contained in:
Arvid Norberg 2010-10-03 01:22:11 +00:00
parent d0dab83104
commit 4600dae248
1 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/peer_connection.cpp
View File

@ -2058,7 +2058,8 @@ namespace libtorrent
// if this is not in the request queue, we have to // if this is not in the request queue, we have to
// assume our outstanding bytes includes this piece too // assume our outstanding bytes includes this piece too
if (!in_req_queue) // if we're disconnecting, we shouldn't add pieces
if (!in_req_queue && !m_disconnecting)
{ {
for (std::vector<pending_block>::iterator i = m_request_queue.begin() for (std::vector<pending_block>::iterator i = m_request_queue.begin()
, end(m_request_queue.end()); i != end; ++i) , end(m_request_queue.end()); i != end; ++i)
@ -3287,6 +3288,11 @@ namespace libtorrent
t->remove_peer(this); t->remove_peer(this);
m_torrent.reset(); m_torrent.reset();
} }
else
{
TORRENT_ASSERT(m_download_queue.empty());
TORRENT_ASSERT(m_request_queue.empty());
}
#if defined TORRENT_DEBUG && defined TORRENT_EXPENSIVE_INVARIANT_CHECKS #if defined TORRENT_DEBUG && defined TORRENT_EXPENSIVE_INVARIANT_CHECKS
// since this connection doesn't have a torrent reference // since this connection doesn't have a torrent reference