[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [46305] trunk/blender/intern/audaspace/ intern/AUD_Reference.h: Patch [#31240] Fix audaspace deadlock

[Joerg Mueller]

Revision: 46305
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=46305
Author:   nexyon
Date:     2012-05-04 23:36:10 +0000 (Fri, 04 May 2012)
Log Message:
-----------
Patch [#31240] Fix audaspace deadlock
fix for [#31097] glibc error when playing sound using BGE
by Wander Lairson Costa

Note: This deadlock fix makes the code non-threadsafe again, a proper solution has to be found still.

Modified Paths:
--------------
    trunk/blender/intern/audaspace/intern/AUD_Reference.h

Modified: trunk/blender/intern/audaspace/intern/AUD_Reference.h
===================================================================
--- trunk/blender/intern/audaspace/intern/AUD_Reference.h	2012-05-04 23:28:27 UTC (rev 46304)
+++ trunk/blender/intern/audaspace/intern/AUD_Reference.h	2012-05-04 23:36:10 UTC (rev 46305)
@@ -174,8 +174,14 @@
 			std::cerr << "-" << typeid(*m_reference).name() << std::endl;
 #endif
 		if(AUD_ReferenceHandler::decref(m_original))
+		{
+			pthread_mutex_unlock(AUD_ReferenceHandler::getMutex());
 			delete m_reference;
-		pthread_mutex_unlock(AUD_ReferenceHandler::getMutex());
+		}
+		else
+		{
+			pthread_mutex_unlock(AUD_ReferenceHandler::getMutex());
+		}
 	}
 
 	/**
@@ -194,7 +200,11 @@
 			std::cerr << "-" << typeid(*m_reference).name() << std::endl;
 #endif
 		if(AUD_ReferenceHandler::decref(m_original))
+		{
+			pthread_mutex_unlock(AUD_ReferenceHandler::getMutex());
 			delete m_reference;
+			pthread_mutex_lock(AUD_ReferenceHandler::getMutex());
+		}
 
 		m_original = ref.m_original;
 		m_reference = ref.m_reference;