From 7d53b7efd3ffa759c34e176980892399248d0a4e Mon Sep 17 00:00:00 2001 From: Arvid Norberg Date: Tue, 30 Dec 2014 16:56:03 +0000 Subject: [PATCH] fix merge error --- src/udp_tracker_connection.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/udp_tracker_connection.cpp b/src/udp_tracker_connection.cpp index aea0e0583..93c5b1ba9 100644 --- a/src/udp_tracker_connection.cpp +++ b/src/udp_tracker_connection.cpp @@ -169,11 +169,11 @@ namespace libtorrent get_io_service().post(boost::bind( &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 - ? settings.stop_tracker_timeout - : settings.tracker_completion_timeout - , settings.tracker_receive_timeout); + ? settings.get_int(settings_pack::stop_tracker_timeout) + : settings.get_int(settings_pack::tracker_completion_timeout) + , settings.get_int(settings_pack::tracker_receive_timeout)); } void udp_tracker_connection::name_lookup(error_code const& error