[vlc-devel] [PATCH 8/7] upnp: fix a deadlock on exit

[Steve Lhomme]

---
 modules/services_discovery/upnp.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/services_discovery/upnp.cpp b/modules/services_discovery/upnp.cpp
index 4a3baea..0828ad1 100644
--- a/modules/services_discovery/upnp.cpp
+++ b/modules/services_discovery/upnp.cpp
@@ -1202,13 +1202,13 @@ UpnpInstanceWrapper *UpnpInstanceWrapper::get(vlc_object_t *p_obj, services_disc
 
 void UpnpInstanceWrapper::release(bool isSd)
 {
-    vlc_mutex_locker lock( &s_lock );
     if ( isSd )
     {
         vlc_mutex_locker lock( &m_server_list_lock );
         delete p_server_list;
         p_server_list = NULL;
     }
+    vlc_mutex_locker lock( &s_lock );
     if (--s_instance->m_refcount == 0)
     {
         delete s_instance;
-- 
2.7.2.windows.1