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

daniel-kristjansson · daniel-kristjansson · commit 40f3bae9f21e · 2011-12-05T21:14:13.000-05:00
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.
diff --git 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())
         {

Original file line number	Diff line number	Diff line change
`@@ -5881,8 +5881,8 @@ void MainServer::reconnectTimeout(void)`
`5881`	`5881`	`!masterServerSock->readStringList(strlist) \|\|`
`5882`	`5882`	`strlist.empty() \|\| strlist[0] == "ERROR")`
`5883`	`5883`	`{`
	`5884`	`+ masterServerSock->Unlock(); // DownRef will delete socket...`
`5884`	`5885`	`masterServerSock->DownRef();`
`5885`		`- masterServerSock->Unlock();`
`5886`	`5886`	`masterServerSock = NULL;`
`5887`	`5887`	`if (strlist.empty())`
`5888`	`5888`	`{`