codex-storage/deluge
1
0
Fork 0
mirror of https://github.com/codex-storage/deluge.git synced 2025-02-18 14:26:24 +00:00
Code Issues Packages Projects Releases Wiki Activity

lt sync 2458

Browse Source
This commit is contained in:
Andrew Resch 2008-06-25 04:39:45 +00:00
parent 7280465cd5
commit 28aaa5fe3b
3 changed files with 18 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
libtorrent/src/natpmp.cpp
View File

@ -281,6 +281,7 @@ void natpmp::send_map_request(int i)
void natpmp::resend_request(int i, error_code const& e) void natpmp::resend_request(int i, error_code const& e)
{ {
if (e) return; if (e) return;
if (m_abort) return;
mutex_t::scoped_lock l(m_mutex); mutex_t::scoped_lock l(m_mutex);
if (m_currently_mapping != i) return; if (m_currently_mapping != i) return;

3
libtorrent/src/session_impl.cpp
View File

@ -398,6 +398,7 @@ namespace aux {
#endif #endif
// abort the main thread // abort the main thread
m_abort = true; m_abort = true;
m_queued_for_checking.clear();
if (m_lsd) m_lsd->close(); if (m_lsd) m_lsd->close();
if (m_upnp) m_upnp->close(); if (m_upnp) m_upnp->close();
if (m_natpmp) m_natpmp->close(); if (m_natpmp) m_natpmp->close();
@ -1802,12 +1803,14 @@ namespace aux {
void session_impl::check_torrent(boost::shared_ptr<torrent> const& t) void session_impl::check_torrent(boost::shared_ptr<torrent> const& t)
{ {
if (m_abort) return;
if (m_queued_for_checking.empty()) t->start_checking(); if (m_queued_for_checking.empty()) t->start_checking();
m_queued_for_checking.push_back(t); m_queued_for_checking.push_back(t);
} }
void session_impl::done_checking(boost::shared_ptr<torrent> const& t) void session_impl::done_checking(boost::shared_ptr<torrent> const& t)
{ {
if (m_queued_for_checking.empty()) return;
check_queue_t::iterator next_check = m_queued_for_checking.begin(); check_queue_t::iterator next_check = m_queued_for_checking.begin();
check_queue_t::iterator done = m_queued_for_checking.end(); check_queue_t::iterator done = m_queued_for_checking.end();
for (check_queue_t::iterator i = m_queued_for_checking.begin() for (check_queue_t::iterator i = m_queued_for_checking.begin()

16
libtorrent/src/torrent.cpp
View File

@ -3686,8 +3686,20 @@ namespace libtorrent
if (m_owning_storage.get()) if (m_owning_storage.get())
{ {
TORRENT_ASSERT(m_storage); TORRENT_ASSERT(m_storage);
m_storage->async_save_resume_data( if (m_state == torrent_status::queued_for_checking
bind(&torrent::on_save_resume_data, shared_from_this(), _1, _2)); || m_state == torrent_status::checking_files)
{
if (alerts().should_post(alert::warning))
{
alerts().post_alert(save_resume_data_alert(boost::shared_ptr<entry>()
, get_handle(), "won't save resume data, torrent does not have a complete resume state yet"));
}
}
else
{
m_storage->async_save_resume_data(
bind(&torrent::on_save_resume_data, shared_from_this(), _1, _2));
}
} }
else else
{ {