mirror/musikcube
1
0
Fork 0
mirror of https://github.com/clangen/musikcube.git synced 2025-01-30 15:32:37 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixed a deadlock in Transport.

Browse Source
This commit is contained in:
Casey Langen 2016-05-28 01:08:57 -07:00
parent 9e5a4dc63e
commit 35750d9da3
1 changed files with 15 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
src/core/playback/Transport.cpp
View File

@ -237,14 +237,23 @@ void Transport::OnPlaybackAlmostEnded(Player* player) {
}
void Transport::RemoveActive(Player* player) {
boost::recursive_mutex::scoped_lock lock(this->stateMutex);
bool found = false;
std::list<Player*>::iterator it =
std::find(this->active.begin(), this->active.end(), player);
{
boost::recursive_mutex::scoped_lock lock(this->stateMutex);
if (it != this->active.end()) {
delete (*it);
this->active.erase(it);
std::list<Player*>::iterator it =
std::find(this->active.begin(), this->active.end(), player);
if (it != this->active.end()) {
this->active.erase(it);
found = true;
}
}
/* outside of the critical section, otherwise potential deadlock */
if (found) {
delete player;
}
}