Ticket #9057: remotefile_deadlock.diff

mythtv/libs/libmythdb/remotefile.cpp

@@ -163 +163 @@
                      QString(", error was %1").arg(strlist[1]) :
                      QString(", remote error")));
         }
-
-        // Close the sockets if we received an error so that isOpen() will
-        // return false if the caller tries to use the RemoteFile.
-        Close();
     }
 
     return lsock;
@@ -176 +172 @@
 {
     QMutexLocker locker(&lock);
     controlSock = openSocket(true);
+    if (!controlSock)
+        return false;
+
     sock = openSocket(false);
-    return isOpen();
+    if (!sock)
+    {
+        // Close the sockets if we received an error so that isOpen() will
+        // return false if the caller tries to use the RemoteFile.
+        locker.unlock();
+        Close();
+        return false;
 }
+    return true;
+}
 
 void RemoteFile::Close(void)
 {