summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDaniel Kristjansson <danielk@cuymedia.net>2011-12-06 01:26:00 (GMT)
committer Daniel Kristjansson <danielk@cuymedia.net>2011-12-06 02:14:13 (GMT)
commit40f3bae9f21e70ae77015682571338abc08eeaf1 (patch)
treed4118e842d487ca22c3c9319254b32ca7d30ea4d
parentc4ee599818c8cfd6f8e9b69df3011ca527d39295 (diff)
Refs #6516. Fix a regression caused by [21445] aka [2fdeb3fc].
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.
-rw-r--r--mythtv/programs/mythbackend/mainserver.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/mythtv/programs/mythbackend/mainserver.cpp b/mythtv/programs/mythbackend/mainserver.cpp
index b224db4..f249d7d 100644
--- a/mythtv/programs/mythbackend/mainserver.cpp
+++ b/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())
{