Ticket #3279: backend_connect.diff

mythtv/libs/libmyth/mythcontext.cpp

@@ -877 +877 @@
                                        bool blockingClient)
 {
     MythSocket *serverSock = NULL;
+    MythBusyDialog *busy = NULL;
     int cnt = 1;
+    
+    bool enableGUI=false;
+    if(GetMainWindow())
+        enableGUI=true;
+    else
+        enableGUI=false;
 
+VERBOSE(VB_GENERAL, enableGUI);
     int sleepTime = GetNumSetting("WOLbackendReconnectWaitTime", 0);
     int maxConnTry = GetNumSetting("WOLbackendConnectRetry", 1);
 
@@ -916 +924 @@
                         manageLock = true;
                         d->serverSockLock.unlock();
                     }
-                    MythPopupBox::showOkPopup(d->mainWindow, 
+                    if (GetMainWindow())
+                        MythPopupBox::showOkPopup(d->mainWindow, 
                                               "connection failure",
                                               tr("Could not connect to the "
                                                  "master backend server -- is "
@@ -932 +941 @@
             }
             else
             {
+                if (GetMainWindow())
+                {
+                    busy = new MythBusyDialog(QObject::tr("Waiting for Server..."));
+                    busy->start(1);
+                }
+
                 VERBOSE(VB_GENERAL, "Trying to wake up the MasterBackend "
                                     "now.");
                 QString wol_cmd = GetSetting("WOLbackendCommand",
@@ -939 +954 @@
                                              "WakeServerCommand now, if "
                                              "set!\'");
                 system(wol_cmd.ascii());
-
-                VERBOSE(VB_GENERAL, QString("Waiting for %1 seconds until I "
-                                            "try to reconnect again.")
+                cout << wol_cmd.ascii();
+                
+                VERBOSE(VB_GENERAL, QString("Waiting for %1 seconds before I send wake command again.")
                                             .arg(sleepTime));
-                sleep(sleepTime);
+                
+                int sleepCount = 0;
+                serverSock = new MythSocket();                
+                while (!serverSock->connect(hostname, port))
+                {
+                    sleep(1);
+                    sleepCount++;
+                    if (sleepCount > sleepTime)
+                        break;
+                }
+                serverSock->DownRef();
+                serverSock = NULL;                        
                 ++cnt;
+                if (GetMainWindow())
+                    busy->Close();
             }
             d->attemptingToConnect = false;
         }