Ticket #11238: Added-SafeConnectToMasterServer2.diff

mythtv/libs/libmythbase/mythcorecontext.cpp

@@ -293 +293 @@
     return true;
 }
 
+// Connects to master server safely (i.e. by taking m_sockLock)
+bool MythCoreContext::SafeConnectToMasterServer(bool openEventSocket)
+{
+    QMutexLocker locker(&d->m_sockLock);
+    bool success = true;
+
+    if (!d->m_serverSock)
+    {
+        bool blockingClient = GetNumSetting("idleTimeoutSecs",0) > 0;
+        success = ConnectToMasterServer(blockingClient, openEventSocket);
+    }
+
+    return success;
+}
+
 // Assumes that either m_sockLock is held, or the app is still single
 // threaded (i.e. during startup).
 bool MythCoreContext::ConnectToMasterServer(bool blockingClient,

mythtv/libs/libmythbase/mythcorecontext.h

@@ -60 +60 @@
     void SetEventSocket(MythSocket *eventSock);
     void SetScheduler(MythScheduler *sched);
 
+    bool SafeConnectToMasterServer(bool openEventSocket = true);
     bool ConnectToMasterServer(bool blockingClient = true,
                                bool openEventSocket = true);
 

mythtv/programs/mythfrontend/backendconnectionmanager.cpp

@@ -25 +25 @@
 
     virtual void run(void)
     {
-        // Note: GetMasterHostPrefix() implicitly reconnects the sockets
-        if (gCoreContext->GetMasterHostPrefix().isEmpty())
+        if (!gCoreContext->SafeConnectToMasterServer())
             gCoreContext->dispatch(MythEvent(QString("RECONNECT_FAILURE")));
         else
             gCoreContext->dispatch(MythEvent(QString("RECONNECT_SUCCESS")));