merged auto-manage fix from RC_0_16

This commit is contained in:
Arvid Norberg 2013-11-24 09:03:22 +00:00
parent d64d12e50d
commit 311ef5d3a4
2 changed files with 6 additions and 4 deletions

View File

@ -25,6 +25,7 @@
* fix uTP edge case where udp socket buffer fills up
* fix nagle implementation in uTP
* fix auto-manage issue when pausing session
* fix bug in non-sparse mode on windows, causing incorrect file errors to be generated
* fix set_name() on file_storage actually affecting save paths
* fix large file support issue on mingw

View File

@ -7346,7 +7346,12 @@ namespace libtorrent
m_graceful_pause_mode = graceful;
if (!m_ses.is_paused() || (prev_graceful && !m_graceful_pause_mode))
{
do_pause();
// if this torrent was just paused
// we might have to resume some other auto-managed torrent
m_ses.trigger_auto_manage();
}
}
void torrent::do_pause()
@ -7436,10 +7441,6 @@ namespace libtorrent
set_state(torrent_status::queued_for_checking);
TORRENT_ASSERT(!m_queued_for_checking);
}
// if this torrent was just paused
// we might have to resume some other auto-managed torrent
m_ses.trigger_auto_manage();
}
#if defined TORRENT_VERBOSE_LOGGING || defined TORRENT_ERROR_LOGGING || defined TORRENT_LOGGING