From 5adb8d5533a65edacf49efc791bcda5fd6bfa0fd Mon Sep 17 00:00:00 2001
From: Arvid Norberg <arvid@libtorrent.org>
Date: Tue, 2 Mar 2010 03:55:47 +0000
Subject: [PATCH] the proper fix

---
 include/libtorrent/alert_types.hpp | 2 +-
 src/tracker_manager.cpp            | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/include/libtorrent/alert_types.hpp b/include/libtorrent/alert_types.hpp
index 0a23e8fc9..c276af4a2 100644
--- a/include/libtorrent/alert_types.hpp
+++ b/include/libtorrent/alert_types.hpp
@@ -247,7 +247,7 @@ namespace libtorrent
 			, times_in_row(times)
 			, status_code(status)
 			, error(e)
-			, msg(msg)
+			, msg(m)
 		{
 			TORRENT_ASSERT(!url.empty());
 		}
diff --git a/src/tracker_manager.cpp b/src/tracker_manager.cpp
index cf3312efe..480b6672c 100644
--- a/src/tracker_manager.cpp
+++ b/src/tracker_manager.cpp
@@ -144,7 +144,7 @@ namespace libtorrent
 		, char const* msg, int interval, int min_interval)
 	{
 		boost::shared_ptr<request_callback> cb = requester();
-		if (cb) cb->tracker_request_error(m_req, code, ec, msg ? msg : ""
+		if (cb) cb->tracker_request_error(m_req, code, ec, msg
 			, interval == 0 ? min_interval : interval);
 		close();
 	}