From 3515199eb579eca5bfdf5f7dee1372f4a9a53c2b Mon Sep 17 00:00:00 2001
From: Arvid Norberg <arvid@libtorrent.org>
Date: Tue, 29 Nov 2011 11:12:11 +0000
Subject: [PATCH] fix python deadlock when using python extensions

---
 ChangeLog                          | 1 +
 bindings/python/src/magnet_uri.cpp | 2 ++
 2 files changed, 3 insertions(+)

diff --git a/ChangeLog b/ChangeLog
index 09fff0cbe..034ed9b83 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -99,6 +99,7 @@
 	  incoming connection
 	* added more detailed instrumentation of the disk I/O thread
 
+	* fix python deadlock when using python extensions
 	* fixed small memory leak in DHT
 
 0.15.9 release
diff --git a/bindings/python/src/magnet_uri.cpp b/bindings/python/src/magnet_uri.cpp
index 08e13f313..bb66f52da 100644
--- a/bindings/python/src/magnet_uri.cpp
+++ b/bindings/python/src/magnet_uri.cpp
@@ -25,6 +25,8 @@ namespace {
         std::list<std::string> string_storage;
         dict_to_add_torrent_params(params, p, resume_buf, string_storage);
 
+        allow_threading_guard guard;
+
 #ifndef BOOST_NO_EXCEPTIONS
         return add_magnet_uri(s, uri, p);
 #else