From 5033960045e538bc80f95177e9aaaf0991c8863a Mon Sep 17 00:00:00 2001
From: Arvid Norberg <arvid@libtorrent.org>
Date: Thu, 28 Feb 2013 04:31:55 +0000
Subject: [PATCH] merged fix from RC_0_16

---
 examples/client_test.cpp | 1 +
 src/magnet_uri.cpp       | 1 +
 2 files changed, 2 insertions(+)

diff --git a/examples/client_test.cpp b/examples/client_test.cpp
index d9de34bc8..e156f7105 100644
--- a/examples/client_test.cpp
+++ b/examples/client_test.cpp
@@ -1498,6 +1498,7 @@ int main(int argc, char* argv[])
 			if (std::strstr(i->c_str(), "magnet:") == i->c_str())
 			{
 				add_torrent_params tmp;
+				ec.clear();
 				parse_magnet_uri(*i, tmp, ec);
 
 				if (ec) continue;
diff --git a/src/magnet_uri.cpp b/src/magnet_uri.cpp
index 1a8b04aa8..246d90c35 100644
--- a/src/magnet_uri.cpp
+++ b/src/magnet_uri.cpp
@@ -143,6 +143,7 @@ namespace libtorrent
 
 	void parse_magnet_uri(std::string const& uri, add_torrent_params& p, error_code& ec)
 	{
+		ec.clear();
 		std::string name;
 		std::string tracker;