From 294e62a4c3ecb7f1ea12d441822ca4732ceadb97 Mon Sep 17 00:00:00 2001
From: Arvid Norberg <arvid@libtorrent.org>
Date: Wed, 26 Nov 2008 01:31:54 +0000
Subject: [PATCH] current_tracker now also indicates which tracker is being
 tried. fixes #404

---
 ChangeLog       | 2 ++
 src/torrent.cpp | 7 +++++++
 2 files changed, 9 insertions(+)

diff --git a/ChangeLog b/ChangeLog
index 6f37bed6b..869d0cf00 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,4 +1,6 @@
 
+	* if there is no working tracker, current_tracker is the
+	  tracker that is currently being tried
 	* torrents that are checking can now be paused, which will
 	  pause the checking
 	* introduced another torrent state, checking_resume_data, which
diff --git a/src/torrent.cpp b/src/torrent.cpp
index e7efe371f..5cc232987 100644
--- a/src/torrent.cpp
+++ b/src/torrent.cpp
@@ -4636,9 +4636,16 @@ namespace libtorrent
 
 		if (m_last_working_tracker >= 0)
 		{
+			TORRENT_ASSERT(m_last_working_tracker < m_trackers.size());
 			st.current_tracker
 				= m_trackers[m_last_working_tracker].url;
 		}
+		else if (m_currently_trying_tracker >= 0)
+		{
+			TORRENT_ASSERT(m_currently_trying_tracker < m_trackers.size());
+			st.current_tracker
+				= m_trackers[m_currently_trying_tracker].url;
+		}
 
 		st.num_uploads = m_num_uploads;
 		st.uploads_limit = m_max_uploads;