diff options
| author | Rainer Hochecker <fernetmenta@online.de> | 2013-08-02 03:16:59 -0700 |
|---|---|---|
| committer | Rainer Hochecker <fernetmenta@online.de> | 2013-08-02 03:16:59 -0700 |
| commit | 60b93b65eccedcc53703d197fea1d79f84770459 (patch) | |
| tree | 6c5f8cb36b5795fedf581e0f8a27ddea9d89a2ea | |
| parent | 2d38ffdae82de51b50d3f87dade99eba52fc77f0 (diff) | |
| parent | d85887e54c5e315856e927b93d34aebb8dbe5c0d (diff) | |
Merge pull request #3015 from FernetMenta/guilib
CGUIBaseContainer::OnAction - waiting on scroll cunsumes action
| -rw-r--r-- | xbmc/guilib/GUIBaseContainer.cpp | 2 | ||||
| -rw-r--r-- | xbmc/video/windows/GUIWindowFullScreen.cpp | 4 |
2 files changed, 3 insertions, 3 deletions
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) { diff --git a/xbmc/video/windows/GUIWindowFullScreen.cpp b/xbmc/video/windows/GUIWindowFullScreen.cpp index 75ff89de41..4ee956e5b0 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()); |