From 9a49372368201176431d8f9ff28ccad49cafcb09 Mon Sep 17 00:00:00 2001
From: Arvid Norberg <arvid@libtorrent.org>
Date: Thu, 3 Nov 2011 09:20:16 +0000
Subject: [PATCH] fix invariant check now that interest is calculated lazily

---
 src/bt_peer_connection.cpp |  9 ---------
 src/peer_connection.cpp    | 10 ++++++++++
 2 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/src/bt_peer_connection.cpp b/src/bt_peer_connection.cpp
index c22e2655f..f5e1fe4a8 100644
--- a/src/bt_peer_connection.cpp
+++ b/src/bt_peer_connection.cpp
@@ -3418,15 +3418,6 @@ namespace libtorrent
 	{
 		boost::shared_ptr<torrent> t = associated_torrent().lock();
 
-		if (!m_disconnect_started && m_initialized)
-		{
-			// none of this matters if we're disconnecting anyway
-			if (t->is_finished())
-				TORRENT_ASSERT(!is_interesting());
-			if (is_seed())
-				TORRENT_ASSERT(upload_only());
-		}
-
 #ifndef TORRENT_DISABLE_ENCRYPTION
 		TORRENT_ASSERT( (bool(m_state != read_pe_dhkey) || m_dh_key_exchange.get())
 				|| !is_local());
diff --git a/src/peer_connection.cpp b/src/peer_connection.cpp
index c0ff04218..a39a56643 100644
--- a/src/peer_connection.cpp
+++ b/src/peer_connection.cpp
@@ -5517,6 +5517,16 @@ namespace libtorrent
 		TORRENT_ASSERT(m_download_limit >= 0);
 
 		boost::shared_ptr<torrent> t = m_torrent.lock();
+
+		if (!m_disconnect_started && m_initialized)
+		{
+			// none of this matters if we're disconnecting anyway
+			if (t->is_finished())
+				TORRENT_ASSERT(!is_interesting());
+			if (is_seed())
+				TORRENT_ASSERT(upload_only());
+		}
+
 		if (m_disconnecting)
 		{
 			TORRENT_ASSERT(m_download_queue.empty());