Ticket #8526: mythbackend_MainServer_BackendQueryDiskSpace_deadlock.patch

programs/mythbackend/mainserver.cpp

@@ -3980 +3980 @@
         QMap <QString, bool> backendsCounted;
         QString pbsHost;
 
+        list<PlaybackSock *> localPlaybackList;
+
         sockListLock.lockForRead();
 
         vector<PlaybackSock *>::iterator pbsit = playbackList.begin();
@@ -3994 +3996 @@
                 continue;
 
             backendsCounted[pbs->getHostname()] = true;
-            pbs->GetDiskSpace(strlist);
+            pbs->UpRef();
+            localPlaybackList.push_back(pbs);
             allHostList += "," + pbs->getHostname();
         }
 
         sockListLock.unlock();
+
+        for (list<PlaybackSock *>::iterator p = localPlaybackList.begin() ;
+             p != localPlaybackList.end() ; ++p) {
+            (*p)->GetDiskSpace(strlist);
+            (*p)->DownRef();
+        }
     }
 
     if (!consolidated)