Browse files

Refs #6516. Fix a regression caused by [21445] aka [2fdeb3f].

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...
1 parent c4ee599 commit 40f3bae9f21e70ae77015682571338abc08eeaf1 @daniel-kristjansson daniel-kristjansson committed Dec 5, 2011
Showing with 1 addition and 1 deletion.
  1. +1 −1 mythtv/programs/mythbackend/mainserver.cpp
View
2 mythtv/programs/mythbackend/mainserver.cpp
@@ -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())
{

0 comments on commit 40f3bae

Please sign in to comment.