From 76e1a768743bae1da203fed74d5fc2dfc7a0a83a Mon Sep 17 00:00:00 2001
From: Kai Sommerfeld <kai.sommerfeld@gmx.com>
Date: Sat, 24 Dec 2016 12:16:34 +0100
Subject: [PATCH] [PVR] Fix guide window: do not jump to grid start on channel
 group change; go to 'now' instead.

---
 system/keymaps/keyboard.xml      | 3 ++-
 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 8b118276aa6d0..0db5d7d9cb04b 100644
--- a/system/keymaps/keyboard.xml
+++ b/system/keymaps/keyboard.xml
@@ -240,6 +240,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>
@@ -763,4 +764,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 e29cca20a7004..8ec861104b105 100644
--- a/xbmc/epg/GUIEPGGridContainer.cpp
+++ b/xbmc/epg/GUIEPGGridContainer.cpp
@@ -748,7 +748,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);