Skip to content
Snippets Groups Projects
Commit 60b12a24 authored by Monroe Linden's avatar Monroe Linden
Browse files

Patch on a fix for the llmediadataclient.cpp unit test.

My refactor of LLMediaDataClient caused a crash in the windows unit test.  Change set 92fd90bd795a fixed the crash, but broke the code in question.  This changeset should make the code behave correctly, while removing some premature optimization that I now think didn't properly in the first place.
parent 4db872e1
No related branches found
No related tags found
No related merge requests found
...@@ -263,18 +263,15 @@ void LLMediaDataClient::pushBack(request_ptr_t request) ...@@ -263,18 +263,15 @@ void LLMediaDataClient::pushBack(request_ptr_t request)
void LLMediaDataClient::trackRequest(request_ptr_t request) void LLMediaDataClient::trackRequest(request_ptr_t request)
{ {
request_set_t::iterator iter = mUnQueuedRequests.lower_bound(request); request_set_t::iterator iter = mUnQueuedRequests.find(request);
if (iter != mUnQueuedRequests.end()) if(iter != mUnQueuedRequests.end())
{ {
if(*iter == request) LL_WARNS("LLMediaDataClient") << "Tracking already tracked request: " << *request << LL_ENDL;
{ }
LL_WARNS("LLMediaDataClient") << "Tracking already tracked request: " << *request << LL_ENDL; else
} {
else mUnQueuedRequests.insert(request);
{
mUnQueuedRequests.insert(iter, request);
}
} }
} }
...@@ -284,14 +281,11 @@ void LLMediaDataClient::stopTrackingRequest(request_ptr_t request) ...@@ -284,14 +281,11 @@ void LLMediaDataClient::stopTrackingRequest(request_ptr_t request)
if (iter != mUnQueuedRequests.end()) if (iter != mUnQueuedRequests.end())
{ {
if(*iter == request) mUnQueuedRequests.erase(iter);
{ }
mUnQueuedRequests.erase(iter); else
} {
else LL_WARNS("LLMediaDataClient") << "Removing an untracked request: " << *request << LL_ENDL;
{
LL_WARNS("LLMediaDataClient") << "Removing an untracked request: " << *request << LL_ENDL;
}
} }
} }
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment