Ticket #7589: 7589.diff

programs/mythlcdserver/lcdprocclient.cpp

@@ -1875 +1875 @@
     if (lcd_bigclock)
         dobigclock(0);
     else
-    {
-        if (lcd_showrecstatus && isRecording)
-            outputCenteredText("Time", tr("RECORDING"), "topWidget", 1);
-        else
-            outputCenteredText("Time", QDate::currentDate().toString(dateformat), "topWidget", 1);
-
         dostdclock();
-    }
 }
 
 void LCDProcClient::dostdclock()
 {
+    if (!lcd_showtime)
+        return;
+
+    if (lcd_showrecstatus && isRecording)
+         outputCenteredText("Time", tr("RECORDING"), "topWidget", 1);
+    else
+        outputCenteredText("Time", QDate::currentDate().toString(dateformat), "topWidget", 1);
+
     QString aString;
     int x, y;
 
@@ -1926 +1927 @@
 
     int listTime;
 
-    if (isTimeVisible)
+    if (isTimeVisible || !lcd_showtime)
     {
         // switch to the rec status screen
         setPriority("RecStatus", MEDIUM);

libs/libmythdb/lcddevice.cpp

@@ -586 +586 @@
 
 void LCD::switchToTime()
 {
-    if (!lcd_ready || !lcd_showtime)
+    if (!lcd_ready)
         return;
 
     VERBOSE(VB_IMPORTANT|VB_EXTRA, LOC + "switchToTime");