Merge branch 'master' into ceton

MythTV · Apr 1, 2012 · 6e72a9b · 6e72a9b
2 parents 312968d + 8bbf302
commit 6e72a9b
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 5 deletions.
diff --git a/mythplugins/mytharchive/mytharchive/main.cpp b/mythplugins/mytharchive/mytharchive/main.cpp
@@ -329,7 +329,7 @@ int mythplugin_init(const char *libversion)
             "Couldn't upgrade database to new schema, exiting.");
         return -1;
     }
-    gCoreContext->ActivateSettingsCache(false);
+    gCoreContext->ActivateSettingsCache(true);
 
     ArchiveSettings settings;
     settings.Load();

diff --git a/mythtv/programs/mythbackend/httpstatus.cpp b/mythtv/programs/mythbackend/httpstatus.cpp
@@ -964,7 +964,7 @@ int HttpStatus::PrintScheduled( QTextStream &os, QDomElement scheduled )
 
                 if ( airDate.isValid())
                     os << "Orig. Airdate: "
-                       << airDate.toString(longdateformat + " " +timeformat)
+                       << airDate.toString(longdateformat)
                        << "<br /><br />";
 
                 os << sDesc << "<br /><br />"

diff --git a/mythtv/programs/mythbackend/services/dvr.cpp b/mythtv/programs/mythbackend/services/dvr.cpp
@@ -444,9 +444,6 @@ int Dvr::AddRecordSchedule   ( int       nChanId,
     RecordingInfo *info = new RecordingInfo(nChanId, dStartTime, false);
     RecordingRule *rule = info->GetRecordingRule();
 
-    delete info;
-    info = NULL;
-
     if (sType.isEmpty())
         sType = "single";
 
@@ -459,6 +456,7 @@ int Dvr::AddRecordSchedule   ( int       nChanId,
     if (sDupIn.isEmpty())
         sDupIn = "all";
 
+    rule->m_title = info->GetTitle();
     rule->m_type = recTypeFromString(sType);
     rule->m_searchType = searchTypeFromString(sSearchType);
     rule->m_dupMethod = dupMethodFromString(sDupMethod);