wornvirtue
/
premiere-libtorrent
forked from premiere/premiere-libtorrent
1
0
Fork 0
Code Pull Requests Activity

fix merge error

This commit is contained in:
Arvid Norberg 2014-12-30 16:56:03 +00:00
parent fcf6beace5
commit 7d53b7efd3
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/udp_tracker_connection.cpp
View File

@ -169,11 +169,11 @@ namespace libtorrent
get_io_service().post(boost::bind( get_io_service().post(boost::bind(
&udp_tracker_connection::start_announce, shared_from_this())); &udp_tracker_connection::start_announce, shared_from_this()));
session_settings const& settings = m_ses.settings(); aux::session_settings const& settings = m_man.settings();
set_timeout(tracker_req().event == tracker_request::stopped set_timeout(tracker_req().event == tracker_request::stopped
? settings.stop_tracker_timeout ? settings.get_int(settings_pack::stop_tracker_timeout)
: settings.tracker_completion_timeout : settings.get_int(settings_pack::tracker_completion_timeout)
, settings.tracker_receive_timeout); , settings.get_int(settings_pack::tracker_receive_timeout));
} }
void udp_tracker_connection::name_lookup(error_code const& error void udp_tracker_connection::name_lookup(error_code const& error