Ticket #11562: suggestedstarttime.patch.v1

File suggestedstarttime.patch.v1, 1.5 KB (added by Bill Meek <keemllib@…, 11 years ago)

Replaces .v0

Line 
1diff --git a/mythtv/programs/mythbackend/httpstatus.cpp b/mythtv/programs/mythbackend/httpstatus.cpp
2index 8571a58..be0272f 100644
3--- a/mythtv/programs/mythbackend/httpstatus.cpp
4+++ b/mythtv/programs/mythbackend/httpstatus.cpp
5@@ -1392,13 +1392,17 @@ int HttpStatus::PrintMachineInfo( QTextStream &os, QDomElement info )
6             QString sStatus = e.attribute( "status"   , ""  );
7             QDateTime next  = MythDate::fromString( e.attribute( "next"     , ""  ));
8             QString sNext   = next.isNull() ? "" :
9-                                MythDate::toString(next, MythDate::kDatabase);
10+                                MythDate::toString(next, MythDate::kDateTimeFull);
11             QString sMsg    = "";
12 
13             QDateTime thru  = MythDate::fromString( e.attribute( "guideThru", ""  ));
14 
15             QDomText  text  = e.firstChild().toText();
16 
17+            QString mfdblrs =
18+                gCoreContext->GetSetting("mythfilldatabaseLastRunStart");
19+            QDateTime lastrunstart = MythDate::fromString(mfdblrs);
20+
21             if (!text.isNull())
22                 sMsg = text.nodeValue();
23 
24@@ -1412,7 +1416,7 @@ int HttpStatus::PrintMachineInfo( QTextStream &os, QDomElement info )
25 
26             os << sStatus << "<br />\r\n";
27 
28-            if (!next.isNull() && sNext >= sStart)
29+            if (!next.isNull() && next >= lastrunstart)
30             {
31                 os << "    Suggested next mythfilldatabase run: "
32                     << sNext << ".<br />\r\n";