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

daniel-kristjansson · daniel-kristjansson · commit fb1c7607f4aa · 2011-12-05T20:26:15.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().
diff --git a/mythtv/programs/mythbackend/mainserver.cpp b/mythtv/programs/mythbackend/mainserver.cpp
@@ -6096,8 +6096,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
`@@ -6096,8 +6096,8 @@ void MainServer::reconnectTimeout(void)`
`6096`	`6096`	`!masterServerSock->readStringList(strlist) \|\|`
`6097`	`6097`	`strlist.empty() \|\| strlist[0] == "ERROR")`
`6098`	`6098`	`{`
	`6099`	`+ masterServerSock->Unlock(); // DownRef will delete socket...`
`6099`	`6100`	`masterServerSock->DownRef();`
`6100`		`- masterServerSock->Unlock();`
`6101`	`6101`	`masterServerSock = NULL;`
`6102`	`6102`	`if (strlist.empty())`
`6103`	`6103`	`{`