codex-storage
/
deluge
mirror of https://github.com/codex-storage/deluge.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

ltsync 3211

This commit is contained in:
Andrew Resch 2009-01-25 02:51:01 +00:00
parent 24e526ce93
commit 20751de699
2 changed files with 14 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
libtorrent/src/file_pool.cpp
View File

@ -57,8 +57,8 @@ namespace libtorrent
lru_file_entry e = *i;
e.last_use = time_now();
if (e.key != st && ((e.mode & file::rw_mask) != file::read_only
|| (m & file::rw_mask) != file::read_only))
if (e.key != st && (e.mode != file::in
|| m != file::in))
{
// this means that another instance of the storage
// is using the exact same file.

12
libtorrent/src/peer_connection.cpp
View File

@ -2549,6 +2549,10 @@ namespace libtorrent
error_code ec;
m_socket->close(ec);
m_ses.close_connection(this, message);
// we should only disconnect while we still have
// at least one reference left to the connection
TORRENT_ASSERT(refcount() > 0);
}
void peer_connection::set_upload_limit(int limit)
@ -3507,6 +3511,10 @@ namespace libtorrent
INVARIANT_CHECK;
// keep ourselves alive in until this function exits in
// case we disconnect
boost::intrusive_ptr<peer_connection> me(self());
TORRENT_ASSERT(m_channel_state[download_channel] == peer_info::bw_network);
m_channel_state[download_channel] = peer_info::bw_idle;
@ -3774,6 +3782,10 @@ namespace libtorrent
INVARIANT_CHECK;
// keep ourselves alive in until this function exits in
// case we disconnect
boost::intrusive_ptr<peer_connection> me(self());
TORRENT_ASSERT(m_channel_state[upload_channel] == peer_info::bw_network);
m_send_buffer.pop_front(bytes_transferred);