Nullcheck in LLTextureFetch::removeRequest was returning without unlocking LLTextureFetch::mQueueMutex if called via LLTextureFetch::deleteRequest

2012-11-13 23:25:32 -06:00
parent fe15371047
commit 97d2085735
1 changed files with 3 additions and 1 deletions
--- a/indra/newview/lltexturefetch.cpp
+++ b/indra/newview/lltexturefetch.cpp
@@ -2168,11 +2168,13 @@ void LLTextureFetch::removeRequest(LLTextureFetchWorker* worker, bool cancel, bo
 {
 	if(!worker)
 	{
+		if(!bNeedsLock)
+			unlockQueue() ;
 		return;
 	}
-	
 	if(bNeedsLock)
 		lockQueue() ;
+
 	size_t erased_1 = mRequestMap.erase(worker->mID);
 	unlockQueue() ;