merged RC_1_1 into master

This commit is contained in:
arvidn 2016-06-10 01:38:32 -04:00
parent 327af3a69e
commit 1946e6c58b
2 changed files with 4 additions and 3 deletions

View File

@ -144,7 +144,7 @@ private:
{
using namespace std::placeholders;
asio::ip::tcp::endpoint const ep = m_out_socket.remote_endpoint();
asio::ip::tcp::endpoint const ep = m_socket.remote_endpoint();
std::printf("fake_peer::connect (%s) -> (%d) %s\n"
, lt::print_endpoint(ep).c_str(), ec.value()
, ec.message().c_str());
@ -235,6 +235,8 @@ private:
void write_send_buffer(boost::system::error_code const& ec
, size_t bytes_transferred)
{
using namespace std::placeholders;
printf("fake_peer::write_send_buffer() -> (%d) %s\n"
, ec.value(), ec.message().c_str());

View File

@ -2186,13 +2186,12 @@ namespace libtorrent
if (j->ret == piece_manager::fatal_disk_error)
{
m_resume_data.reset();
m_add_torrent_params.reset();
handle_disk_error(j);
auto_managed(false);
pause();
set_state(torrent_status::checking_files);
if (should_check_files()) start_checking();
m_add_torrent_params.reset();
return;
}