Ticket #11316: slave_events-v0.27-pre2-596-g397d1e9.patch

mythtv/libs/libmythbase/mythsocket.cpp

@@ -346 +346 @@
         return false;
     }
 
+#if 0
     if (!strlist.empty() && strlist[0] == "BACKEND_MESSAGE")
     {
         LOG(VB_GENERAL, LOG_ERR, LOC + "Got MythEvent on non-event socket");
         return false;
     }
+#endif
 
     return true;
 }

mythtv/programs/mythbackend/playbacksock.cpp

@@ -82 +82 @@
     {
         QMutexLocker locker(&sockLock);
         expectingreply = true;
+
         ok = sock->SendReceiveStringList(strlist);
+        while (ok && strlist[0] == "BACKEND_MESSAGE")
+        {
+            // oops, not for us
+            if (strlist.size() >= 2)
+            {
+                QString message = strlist[1];
+                strlist.pop_front();
+                strlist.pop_front();
+                MythEvent me(message, strlist);
+                gCoreContext->dispatch(me);
+            }
+
+            ok = sock->ReadStringList(strlist);
+        }
+
         expectingreply = false;
     }