Ticket #6595: 6595-mainserver-qtimer.patch

programs/mythbackend/mainserver.h

@@ -56 +56 @@
     void deferredDeleteSlot(void);
     void autoexpireUpdate(void);
 
+  signals:
+    void masterConnectionLost(void);
+
   private slots:
     void newConnection(MythSocket *);
 

programs/mythbackend/mainserver.cpp

@@ -204 +204 @@
         masterServerReconnect->setSingleShot(true);
         connect(masterServerReconnect, SIGNAL(timeout()), this,
                 SLOT(reconnectTimeout()));
+        connect(this, SIGNAL(masterConnectionLost(void)), this,
+                SLOT(reconnectTimeout()));
         masterServerReconnect->start(1000);
     }
 
@@ -4262 +4264 @@
             sockListLock.unlock();
             masterServer->DownRef();
             masterServer = NULL;
-            masterServerReconnect->start(1000);
+            // Called from MythSocketThread - cannot start MainServer's timer
+            // masterServerReconnect->start(1000);
+            emit masterConnectionLost();
             return;
         }
         else if (sock == socket)