diff options
| author | Kai Sommerfeld <kai.sommerfeld@gmx.com> | 2016-12-25 11:48:42 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-12-25 11:48:42 +0100 |
| commit | 27085c731ebb9783c9fc4dbc305a2bacceef892b (patch) | |
| tree | 483dbac36ad6d7fb035bc5bb26d366f6c136d477 | |
| parent | b6f44d6998110a43af884f0147bedc00d46b9d53 (diff) | |
| parent | 5df8e1a8c586c67af068f1fdb37e069cda413c20 (diff) | |
Merge pull request #11265 from ksooo/krypton-pvr-guide-window-fix-channelgroup-change
[PVR] Fix guide window: do not jump to grid start on channel group change; go to 'now' instead
| -rw-r--r-- | system/keymaps/keyboard.xml | 3 | ||||
| -rw-r--r-- | xbmc/epg/GUIEPGGridContainer.cpp | 2 |
2 files changed, 3 insertions, 2 deletions
diff --git a/system/keymaps/keyboard.xml b/system/keymaps/keyboard.xml index d4dffed997..190efe7e65 100644 --- a/system/keymaps/keyboard.xml +++ b/system/keymaps/keyboard.xml @@ -239,6 +239,7 @@ <e>PreviousMenu</e> <t>ShowTimerRule</t> <epg>PreviousMenu</epg> + <g>NextChannelGroup</g> <backspace mod="longpress">Number0</backspace> <!-- 0 key goes to "now" on EPG timeline --> <browser_back mod="longpress">Number0</browser_back> <!-- 0 key goes to "now" on EPG timeline --> </keyboard> @@ -736,4 +737,4 @@ <o>PlayerProcessInfo</o> </keyboard> </PlayerProcessInfo> -</keymap>
\ No newline at end of file +</keymap> diff --git a/xbmc/epg/GUIEPGGridContainer.cpp b/xbmc/epg/GUIEPGGridContainer.cpp index e162f4aff5..16fee97192 100644 --- a/xbmc/epg/GUIEPGGridContainer.cpp +++ b/xbmc/epg/GUIEPGGridContainer.cpp @@ -602,7 +602,7 @@ void CGUIEPGGridContainer::UpdateItems() } } - if (prevSelectedEpgTag) + if (prevSelectedEpgTag && (oldChannelIndex != 0 || oldBlockIndex != 0)) { if (m_gridModel->GetGridItem(newChannelIndex, newBlockIndex)->GetEPGInfoTag() != prevSelectedEpgTag) m_gridModel->FindChannelAndBlockIndex(channelUid, broadcastUid, eventOffset, newChannelIndex, newBlockIndex); |