From 7aa2190a8759c4a703fab46d4b8f8bfcd85fbc57 Mon Sep 17 00:00:00 2001 From: Rainer Hochecker Date: Sun, 28 Jul 2013 15:06:20 +0200 Subject: guilib: CGUIBaseContainer::OnAction - waiting on scroll condition to be satisfied consumes the action, hence return true --- xbmc/guilib/GUIBaseContainer.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/xbmc/guilib/GUIBaseContainer.cpp b/xbmc/guilib/GUIBaseContainer.cpp index ddb34fa5ca..e37750a322 100644 --- a/xbmc/guilib/GUIBaseContainer.cpp +++ b/xbmc/guilib/GUIBaseContainer.cpp @@ -315,7 +315,7 @@ bool CGUIBaseContainer::OnAction(const CAction &action) m_lastHoldTime = CTimeUtils::GetFrameTime(); if(m_scrollItemsPerFrame < 1.0f)//not enough hold time accumulated for one step - return false; + return true; while (m_scrollItemsPerFrame >= 1) { -- cgit v1.2.3 From d85887e54c5e315856e927b93d34aebb8dbe5c0d Mon Sep 17 00:00:00 2001 From: Rainer Hochecker Date: Mon, 29 Jul 2013 20:16:34 +0200 Subject: fix broken channel switching by numbers after: 8768ec8a7260b7dd46c28e601a398d493808edeb --- xbmc/video/windows/GUIWindowFullScreen.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/xbmc/video/windows/GUIWindowFullScreen.cpp b/xbmc/video/windows/GUIWindowFullScreen.cpp index 3e6d714f2f..10eecd5915 100644 --- a/xbmc/video/windows/GUIWindowFullScreen.cpp +++ b/xbmc/video/windows/GUIWindowFullScreen.cpp @@ -262,7 +262,7 @@ bool CGUIWindowFullScreen::OnAction(const CAction &action) if (!channel || !channel->HasPVRChannelInfoTag()) return false; - OnAction(CAction(ACTION_CHANNEL_SWITCH, (float)iChannelNumber)); + g_application.OnAction(CAction(ACTION_CHANNEL_SWITCH, (float)iChannelNumber)); } } else @@ -487,7 +487,7 @@ bool CGUIWindowFullScreen::OnMessage(CGUIMessage& message) CFileItemPtr switchChannel = selectedGroup->GetByChannelNumber(1); if (switchChannel && switchChannel->HasPVRChannelInfoTag()) - OnAction(CAction(ACTION_CHANNEL_SWITCH, (float) switchChannel->GetPVRChannelInfoTag()->ChannelNumber())); + g_application.OnAction(CAction(ACTION_CHANNEL_SWITCH, (float) switchChannel->GetPVRChannelInfoTag()->ChannelNumber())); else { CLog::Log(LOGERROR, "%s - cannot find channel '1' in group %s", __FUNCTION__, selectedGroup->GroupName().c_str()); -- cgit v1.2.3