Ticket #5421: myth-lcdfix-trunk.patch

libs/libmyth/lcddevice.cpp

@@ -227 +227 @@
 
     last_command = someText;
 
-    if (bConnected)
+    if (lcd_ready)
     {
 #if LCD_DEVICE_DEBUG > 9
         VERBOSE(VB_IMPORTANT, "lcddevice: Sending to Server: " << someText);
@@ -277 +277 @@
 
     socket->readBlock(data.data(), dataSize);
 
-    lineFromServer = data;
-    lineFromServer = lineFromServer.replace( QRegExp("\n"), " " );
-    lineFromServer = lineFromServer.replace( QRegExp("\r"), " " );
-    lineFromServer.simplifyWhiteSpace();
+    QStringList responseList = QStringList::split( QRegExp("\r|\n"), data);
 
+    for(uint resp = 0; resp < responseList.count(); resp++) {
+
+        lineFromServer = responseList[resp];
+        lineFromServer.simplifyWhiteSpace();
+
 #if LCD_DEVICE_DEBUG > 4
-    // Make debugging be less noisy
-    if (lineFromServer != "OK")
-        VERBOSE(VB_IMPORTANT, "lcddevice: Received from server: " << lineFromServer);
+        // Make debugging be less noisy
+        if (lineFromServer != "OK")
+            VERBOSE(VB_IMPORTANT, "lcddevice: Received from server: " << lineFromServer);
 #endif
 
-    aList = QStringList::split(" ", lineFromServer);
-    if (aList[0] == "CONNECTED")
-    {
-        // We got "CONNECTED", which is a response to "HELLO"
-        lcd_ready = true;
+        aList = QStringList::split(" ", lineFromServer);
+        if (aList[0] == "CONNECTED")
+        {
+            // We got "CONNECTED", which is a response to "HELLO"
 
-        // get lcd width & height
-        if (aList.count() != 3)
-        {
-            VERBOSE(VB_IMPORTANT, "lcddevice: received bad no. of arguments "
+            //done by init()
+            //lcd_ready = true;
+
+            // get lcd width & height
+            if (aList.count() != 3)
+            {
+                VERBOSE(VB_IMPORTANT, "lcddevice: received bad no. of arguments "
                             "in CONNECTED response from LCDServer");
-        }
+            }
 
-        bool bOK;
-        lcd_width = aList[1].toInt(&bOK);
-        if (!bOK)
-        {
-            VERBOSE(VB_IMPORTANT, "lcddevice: received bad int for width"
+            bool bOK;
+            lcd_width = aList[1].toInt(&bOK);
+            if (!bOK)
+            {
+                VERBOSE(VB_IMPORTANT, "lcddevice: received bad int for width"
                             "in CONNECTED response from LCDServer");
-        }
+            }
 
-        lcd_height = aList[2].toInt(&bOK);
-        if (!bOK)
-        {
-            VERBOSE(VB_IMPORTANT, "lcddevice: received bad int for height"
+            lcd_height = aList[2].toInt(&bOK);
+            if (!bOK)
+            {
+                VERBOSE(VB_IMPORTANT, "lcddevice: received bad int for height"
                             "in CONNECTED response from LCDServer");
+            }
+
+            init();
         }
-
-        init();
-    }
-    else if (aList[0] == "HUH?")
-    {
-        VERBOSE(VB_IMPORTANT, "lcddevice: WARNING: Something is getting passed"
+        else if (aList[0] == "HUH?")
+        {
+            VERBOSE(VB_IMPORTANT, "lcddevice: WARNING: Something is getting passed"
                         "to LCDServer that it doesn't understand");
-        VERBOSE(VB_IMPORTANT, QString("lcddevice: last command: %1").arg( last_command ));
+            VERBOSE(VB_IMPORTANT, QString("lcddevice: last command: %1").arg( last_command ));
+        }
+        else if (aList[0] == "KEY")
+            handleKeyPress(aList.last().stripWhiteSpace());
     }
-    else if (aList[0] == "KEY")
-        handleKeyPress(aList.last().stripWhiteSpace());
 }
 
 void LCD::handleKeyPress(QString key_pressed)