Ticket #9922: fenc-stop-sending-multiple-responses.patch

mythtv/programs/mythfrontend/networkcontrol.cpp

@@ -317 +317 @@
         result = QString("INVALID command '%1', try 'help' for more info")
                          .arg(nc->getArg(0));
 
-    nrLock.lock();
-    networkControlReplies.push_back(new NetworkCommand(nc->getClient(),result));
-    nrLock.unlock();
+    /*
+     * Differentiate between a null result and an empty result allowing the
+     * latter to be sent.
+     */
+    if (!result.isNull())
+    {
+        nrLock.lock();
+        networkControlReplies.push_back(new NetworkCommand(nc->getClient(),result));
+        nrLock.unlock();
 
-    notifyDataAvailable();
+        notifyDataAvailable();
+    }
 }
 
 void NetworkControl::deleteClient(void)
@@ -646 +653 @@
             MythEvent me(message);
             gCoreContext->dispatch(me);
 
-            result.clear();
+            /*
+             * Set a null string result so that nothing is sent back to the
+             * client until a response event is seen.
+             */
+            result = QString();
         }
         else
         {
@@ -1395 +1406 @@
 
 QString NetworkControl::listRecordings(QString chanid, QString starttime)
 {
-    QString result;
+    QString result = "";
     MSqlQuery query(MSqlQuery::InitCon());
     QString queryStr;
     bool appendCRLF = true;