merged changes from RC_1_0

This commit is contained in:
Arvid Norberg 2015-01-28 05:03:34 +00:00
parent e08fedaa75
commit 758d5f4a30
2 changed files with 7 additions and 2 deletions

View File

@ -51,6 +51,7 @@
* almost completely changed the storage interface (for custom storage) * almost completely changed the storage interface (for custom storage)
* added support for hashing pieces in multiple threads * added support for hashing pieces in multiple threads
* fix bug in python binding for file_progress on torrents with no metadata
* fix assert when removing a connected web seed * fix assert when removing a connected web seed
* fix bug in tracker timeout logic * fix bug in tracker timeout logic
* switch UPnP post back to HTTP 1.1 * switch UPnP post back to HTTP 1.1

View File

@ -83,8 +83,12 @@ list file_progress(torrent_handle& handle, int flags)
{ {
allow_threading_guard guard; allow_threading_guard guard;
p.reserve(handle.torrent_file()->num_files()); boost::intrusive_ptr<const torrent_info> ti = handle.torrent_file();
handle.file_progress(p, flags); if (ti)
{
p.reserve(ti->num_files());
handle.file_progress(p, flags);
}
} }
list result; list result;