From 96ea0dc4d07c5e9e415dbbacedbc9aa2e4fa3bac Mon Sep 17 00:00:00 2001 From: Arvid Norberg Date: Mon, 13 Jun 2016 07:46:34 -0400 Subject: [PATCH] fixed bug related to flag_merge_resume_http_seeds flag in add_torrent_params (#813) --- ChangeLog | 1 + include/libtorrent/add_torrent_params.hpp | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 5bed298dd..80e536e0d 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,6 @@ 1.1.1 release + * fixed bug related to flag_merge_resume_http_seeds flag in add_torrent_params * fixed inverted priority of incoming piece suggestions * optimize allow-fast logic * fix issue where FAST extension messages were not used during handshake diff --git a/include/libtorrent/add_torrent_params.hpp b/include/libtorrent/add_torrent_params.hpp index 61ebc4a11..a52ad0e9e 100644 --- a/include/libtorrent/add_torrent_params.hpp +++ b/include/libtorrent/add_torrent_params.hpp @@ -265,7 +265,7 @@ namespace libtorrent // add_torrent_params are also replaced. The default behavior is to // have any web seeds in the resume data take precedence over whatever // is passed in here as well as the .torrent file. - flag_merge_resume_http_seeds = 0x2000, + flag_merge_resume_http_seeds = 0x8000, // the stop when ready flag. Setting this flag is equivalent to calling // torrent_handle::stop_when_ready() immediately after the torrent is