Fix some unsafe usage of ConnectToMasterServer(). Fixes #11364

MythTV · Jan 20, 2013 · 3d35924 · 3d35924
1 parent a9246e9
commit 3d35924
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 8 deletions.
diff --git a/mythtv/libs/libmythbase/mythcorecontext.cpp b/mythtv/libs/libmythbase/mythcorecontext.cpp
@@ -294,16 +294,14 @@ bool MythCoreContext::SetupCommandSocket(MythSocket *serverSock,
 }
 
 // Connects to master server safely (i.e. by taking m_sockLock)
-bool MythCoreContext::SafeConnectToMasterServer(bool openEventSocket)
+bool MythCoreContext::SafeConnectToMasterServer(bool blockingClient,
+                                                bool openEventSocket)
 {
     QMutexLocker locker(&d->m_sockLock);
     bool success = true;
 
-    if (!d->m_serverSock)
-    {
-        bool blockingClient = GetNumSetting("idleTimeoutSecs",0) > 0;
+    if (!d->m_serverSock || !d->m_serverSock->IsConnected())
         success = ConnectToMasterServer(blockingClient, openEventSocket);
-    }
 
     return success;
 }

diff --git a/mythtv/libs/libmythbase/mythcorecontext.h b/mythtv/libs/libmythbase/mythcorecontext.h
@@ -60,7 +60,8 @@ class MBASE_PUBLIC MythCoreContext : public QObject, public MythObservable, publ
     void SetEventSocket(MythSocket *eventSock);
     void SetScheduler(MythScheduler *sched);
 
-    bool SafeConnectToMasterServer(bool openEventSocket = true);
+    bool SafeConnectToMasterServer(bool blockingClient = true,
+                                   bool openEventSocket = true);
     bool ConnectToMasterServer(bool blockingClient = true,
                                bool openEventSocket = true);
 

diff --git a/mythtv/programs/mythfrontend/idlescreen.cpp b/mythtv/programs/mythfrontend/idlescreen.cpp
@@ -77,7 +77,7 @@ bool IdleScreen::CheckConnectionToServer(void)
         bRes = true;
     else
     {
-        if (gCoreContext->ConnectToMasterServer(false))
+        if (gCoreContext->SafeConnectToMasterServer(false))
             bRes = true;
     }
 

diff --git a/mythtv/programs/mythwelcome/welcomedialog.cpp b/mythtv/programs/mythwelcome/welcomedialog.cpp
@@ -573,7 +573,7 @@ bool WelcomeDialog::checkConnectionToServer(void)
         bRes = true;
     else
     {
-        if (gCoreContext->ConnectToMasterServer(false))
+        if (gCoreContext->SafeConnectToMasterServer(false))
         {
             bRes = true;
             updateAll();