Permalink
Browse files

Merge branch 'master' into pvr-ppa

  • Loading branch information...
2 parents ec8076d + ffb0432 commit 23bd2c92719f9eae9a931982e0a3c226d5715f18 @opdenkamp opdenkamp committed May 8, 2011
Showing with 3 additions and 3 deletions.
  1. +3 −3 xbmc/epg/Epg.cpp
View
@@ -221,8 +221,8 @@ void CEpg::RemoveTagsBetween(time_t start, time_t end, bool bRemoveFromDb /* = f
if (tag)
{
bool bMatch(true);
- tag->StartAsLocalTime().GetAsTime(tagBegin);
- tag->EndAsLocalTime().GetAsTime(tagEnd);
+ tag->StartAsUTC().GetAsTime(tagBegin);
+ tag->EndAsUTC().GetAsTime(tagEnd);
if (start > 0 && tagBegin < start)
bMatch = false;
@@ -488,7 +488,7 @@ bool CEpg::UpdateEntries(const CEpg &epg, bool bStoreInDb /* = true */)
CSingleLock lock(m_critSection);
/* remove tags from the current list that will be replaced */
- RemoveTagsBetween(epg.GetFirstDate(), epg.GetLastDate(), bStoreInDb);
+ RemoveTagsBetween(epg.GetFirstDate().GetAsUTCDateTime(), epg.GetLastDate().GetAsUTCDateTime(), bStoreInDb);
/* copy over tags */
for (unsigned int iTagPtr = 0; iTagPtr < epg.size(); iTagPtr++)

0 comments on commit 23bd2c9

Please sign in to comment.