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

merged changes from RC_1_0

This commit is contained in:
Arvid Norberg 2014-10-26 17:48:50 +00:00
parent 85cc72835e
commit 8bd8426f04
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
ChangeLog
View File

@ -35,6 +35,7 @@
1.0.3 release 1.0.3 release
* fix incorrect behavior of flag_use_resume_save_path
* fix protocol race-condition in super seeding mode * fix protocol race-condition in super seeding mode
* support read-only DHT nodes * support read-only DHT nodes
* remove unused partial hash DHT lookups * remove unused partial hash DHT lookups

4
src/torrent.cpp
View File

@ -1731,7 +1731,7 @@ namespace libtorrent
// loading resume data. So peek ahead in this case. // loading resume data. So peek ahead in this case.
// only do this if the user is willing to have the resume data // only do this if the user is willing to have the resume data
// settings override the settings set in add_torrent_params // settings override the settings set in add_torrent_params
if (!m_use_resume_save_path if (m_use_resume_save_path
&& m_resume_data && m_resume_data
&& m_resume_data->entry.type() == lazy_entry::dict_t) && m_resume_data->entry.type() == lazy_entry::dict_t)
{ {
@ -6517,7 +6517,7 @@ namespace libtorrent
} }
super_seeding(rd.dict_find_int_value("super_seeding", 0)); super_seeding(rd.dict_find_int_value("super_seeding", 0));
if (!m_use_resume_save_path) if (m_use_resume_save_path)
{ {
std::string p = rd.dict_find_string_value("save_path"); std::string p = rd.dict_find_string_value("save_path");
if (!p.empty()) m_save_path = p; if (!p.empty()) m_save_path = p;