From 1946e6c58b574c86f92762d3287cacd34b7b063d Mon Sep 17 00:00:00 2001
From: arvidn <arvid@libtorrent.org>
Date: Fri, 10 Jun 2016 01:38:32 -0400
Subject: [PATCH] merged RC_1_1 into master

---
 simulation/fake_peer.hpp | 4 +++-
 src/torrent.cpp          | 3 +--
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/simulation/fake_peer.hpp b/simulation/fake_peer.hpp
index 4291e9ff5..1328f569e 100644
--- a/simulation/fake_peer.hpp
+++ b/simulation/fake_peer.hpp
@@ -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());
 
diff --git a/src/torrent.cpp b/src/torrent.cpp
index 535524b6a..4d8f4f2c6 100644
--- a/src/torrent.cpp
+++ b/src/torrent.cpp
@@ -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;
 		}