diff options
| author | Kai Sommerfeld <kai.sommerfeld@gmx.com> | 2016-10-28 14:11:17 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-10-28 14:11:17 +0200 |
| commit | 64d269d12b5ea72c53cb37e806a3a087093364ca (patch) | |
| tree | bd1fcad10b671a8c47843f6928c0fd6215ae4b24 | |
| parent | dfe69e6520f6c70abe47619108c60ba8a684bfba (diff) | |
| parent | 173abefeb36b693cfbbfec3c8ee1619d4993720e (diff) | |
Merge pull request #10788 from phil65/pvr_next_fallbacks
[gui] - remove fallbacks for pvr next* infolabels
| -rw-r--r-- | xbmc/GUIInfoManager.cpp | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/xbmc/GUIInfoManager.cpp b/xbmc/GUIInfoManager.cpp index c353b5bc7d..1316f2ae28 100644 --- a/xbmc/GUIInfoManager.cpp +++ b/xbmc/GUIInfoManager.cpp @@ -8861,10 +8861,10 @@ std::string CGUIInfoManager::GetVideoLabel(int item) return epgTag ? epgTag->PlotOutline() : ""; case VIDEOPLAYER_NEXT_STARTTIME: epgTag = tag->GetEPGNext(); - return epgTag ? epgTag->StartAsLocalTime().GetAsLocalizedTime("", false) : CDateTime::GetCurrentDateTime().GetAsLocalizedTime("", false); + return epgTag ? epgTag->StartAsLocalTime().GetAsLocalizedTime("", false) : ""; case VIDEOPLAYER_NEXT_ENDTIME: epgTag = tag->GetEPGNext(); - return epgTag ? epgTag->EndAsLocalTime().GetAsLocalizedTime("", false) : CDateTime::GetCurrentDateTime().GetAsLocalizedTime("", false); + return epgTag ? epgTag->EndAsLocalTime().GetAsLocalizedTime("", false) : ""; case VIDEOPLAYER_NEXT_DURATION: { std::string duration; @@ -10440,7 +10440,6 @@ std::string CGUIInfoManager::GetItemLabel(const CFileItem *item, int info, std:: if (tag) return tag->StartAsLocalTime().GetAsLocalizedTime("", false); } - return CDateTime::GetCurrentDateTime().GetAsLocalizedTime("", false); case LISTITEM_NEXT_ENDTIME: if (item->HasPVRChannelInfoTag()) { @@ -10448,7 +10447,6 @@ std::string CGUIInfoManager::GetItemLabel(const CFileItem *item, int info, std:: if (tag) return tag->EndAsLocalTime().GetAsLocalizedTime("", false); } - return CDateTime::GetCurrentDateTime().GetAsLocalizedTime("", false); case LISTITEM_NEXT_STARTDATE: if (item->HasPVRChannelInfoTag()) { @@ -10456,7 +10454,6 @@ std::string CGUIInfoManager::GetItemLabel(const CFileItem *item, int info, std:: if (tag) return tag->StartAsLocalTime().GetAsLocalizedDate(true); } - return CDateTime::GetCurrentDateTime().GetAsLocalizedDate(true); case LISTITEM_NEXT_ENDDATE: if (item->HasPVRChannelInfoTag()) { @@ -10464,7 +10461,6 @@ std::string CGUIInfoManager::GetItemLabel(const CFileItem *item, int info, std:: if (tag) return tag->EndAsLocalTime().GetAsLocalizedDate(true); } - return CDateTime::GetCurrentDateTime().GetAsLocalizedDate(true); case LISTITEM_NEXT_PLOT: if (item->HasPVRChannelInfoTag()) { |