mirror/musikcube
1
0
Fork 0
mirror of https://github.com/clangen/musikcube.git synced 2024-12-29 00:17:49 +00:00
Code Issues Packages Projects Releases Wiki Activity

Revert some unnecessary and buggy restructuring of

Browse Source 
RemoteLibrary::EnqueueAndWait(). While required for LocalLibrary, this
causes issues with RemoteLibrary.
This commit is contained in:
casey langen 2020-10-31 13:40:12 -07:00
parent bd7c60fd57
commit d612a59999
1 changed files with 15 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
src/musikcore/library/RemoteLibrary.cpp
View File

@ -199,29 +199,24 @@ int RemoteLibrary::EnqueueAndWait(QueryPtr query, size_t timeoutMs, Callback cal
context->query = serializableQuery;
context->callback = callback;
if (timeoutMs == kWaitIndefinite) {
this->RunQuery(context);
}
else {
queryQueue.push_back(context);
queueCondition.notify_all();
queryQueue.push_back(context);
queueCondition.notify_all();
if (timeoutMs > 0) {
while (
!this->exit &&
this->IsQueryInFlight(context->query) &&
!isQueryDone(context->query))
{
if (timeoutMs == kWaitIndefinite) {
this->syncQueryCondition.wait(lock);
if (timeoutMs > 0) {
while (
!this->exit &&
this->IsQueryInFlight(context->query) &&
!isQueryDone(context->query))
{
if (timeoutMs == kWaitIndefinite) {
this->syncQueryCondition.wait(lock);
break;
}
else {
auto result = this->syncQueryCondition.wait_for(lock, timeoutMs * milliseconds(1));
if (result == std::cv_status::timeout) {
break;
}
else {
auto result = this->syncQueryCondition.wait_for(lock, timeoutMs * milliseconds(1));
if (result == std::cv_status::timeout) {
break;
}
}
}
}
}