Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP

Loading…

Fix timeline start/end time after removed local time conversions #578

Merged
merged 1 commit into from

3 participants

@mikrohard

Currently the start/end times are off by the UTC/local time offset.

@opdenkamp
Owner

thanks, merged

@opdenkamp opdenkamp merged commit f6919c5 into opdenkamp:master
@FernetMenta
Collaborator

This is wrong. You don't want the grid start in UTC. In my region we are 2 hours ahead of UTC and with this change the grid started 2 hours too early.

this should have fixed that issue after the last changes in this code, but if you are still having this issue, I haven't checked it properly.

Collaborator

I did not notice this issue before this change. I have reverted this in my repo and it looks ok again.

Well... we are in the same timeline (currently two hours ahead of utc) and without this patch the timeline starts two hours late (tested on eden pvr). Currently I don't have access to my computer but I am almost certain that my clock was set to the right timelime. And I noticed the same issue on openelec built with latest eden-pvr...

Collaborator

Can you test with master?
Check the call to SetStartEnd, the time passed to this method is already UTC.

Collaborator

I tested Eden-pvr where this patch is NOT applied and it works correctly on my system. timezone (OS) is CEST, XBMC timezone set to Berlin

this is wrong indeed. I'll revert it

Sorry for this.. I'll check what was causing the issue when I get home.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
This page is out of date. Refresh to see the latest.
Showing with 2 additions and 2 deletions.
  1. +2 −2 xbmc/epg/GUIEPGGridContainer.cpp
View
4 xbmc/epg/GUIEPGGridContainer.cpp
@@ -1638,8 +1638,8 @@ void CGUIEPGGridContainer::GoToEnd()
void CGUIEPGGridContainer::SetStartEnd(CDateTime start, CDateTime end)
{
- m_gridStart = CDateTime(start.GetYear(), start.GetMonth(), start.GetDay(), start.GetHour(), start.GetMinute() >= 30 ? 30 : 0, 0);
- m_gridEnd = CDateTime(end.GetYear(), end.GetMonth(), end.GetDay(), end.GetHour(), end.GetMinute() >= 30 ? 30 : 0, 0);
+ m_gridStart = CDateTime(start.GetYear(), start.GetMonth(), start.GetDay(), start.GetHour(), start.GetMinute() >= 30 ? 30 : 0, 0).GetAsUTCDateTime();
+ m_gridEnd = CDateTime(end.GetYear(), end.GetMonth(), end.GetDay(), end.GetHour(), end.GetMinute() >= 30 ? 30 : 0, 0).GetAsUTCDateTime();
CLog::Log(LOGDEBUG, "CGUIEPGGridContainer - %s - start=%s end=%s",
__FUNCTION__, m_gridStart.GetAsLocalizedDateTime(false, true).c_str(), m_gridEnd.GetAsLocalizedDateTime(false, true).c_str());
Something went wrong with that request. Please try again.