From 330f1a2785f097daea60cd56285066dbfa376a02 Mon Sep 17 00:00:00 2001
From: Arvid Norberg <arvid@libtorrent.org>
Date: Sun, 9 May 2010 00:55:22 +0000
Subject: [PATCH] fix to incoming-starts-paused torrent

---
 src/peer_connection.cpp | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/src/peer_connection.cpp b/src/peer_connection.cpp
index 0d9ece127..574d26383 100644
--- a/src/peer_connection.cpp
+++ b/src/peer_connection.cpp
@@ -1111,9 +1111,12 @@ namespace libtorrent
 
 		TORRENT_ASSERT(m_torrent.expired());
 
-		if (t->is_paused())
+		if (t->is_paused()
+			&& m_ses.m_settings.incoming_starts_queued_torrents
+			&& !m_ses.paused()
+			&& !t->is_aborted()
+			&& !m_ses.is_aborted())
 		{
-			TORRENT_ASSERT(m_ses.m_settings.incoming_starts_queued_torrents);
 			t->resume();
 		}