Skip to content

Commit

Permalink
Refs #6516. Fix a regression caused by [21445] aka [2fdeb3f].
Browse files Browse the repository at this point in the history
We were unlocking a mutex after it was deleted. The lock is for the writeStringList()/readStringList() and should have been released before the DownRef().

Thanks go to Helen Buus for finding this.
  • Loading branch information
daniel-kristjansson committed Dec 6, 2011
1 parent c4ee599 commit 40f3bae
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion mythtv/programs/mythbackend/mainserver.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -5881,8 +5881,8 @@ void MainServer::reconnectTimeout(void)
!masterServerSock->readStringList(strlist) ||
strlist.empty() || strlist[0] == "ERROR")
{
masterServerSock->Unlock(); // DownRef will delete socket...
masterServerSock->DownRef();
masterServerSock->Unlock();
masterServerSock = NULL;
if (strlist.empty())
{
Expand Down

0 comments on commit 40f3bae

Please sign in to comment.