diff options
| author | Kai Sommerfeld <kai.sommerfeld@gmx.com> | 2015-12-10 12:12:48 +0100 |
|---|---|---|
| committer | Kai Sommerfeld <kai.sommerfeld@gmx.com> | 2015-12-10 12:12:48 +0100 |
| commit | b4646074a2f4321b57d708147e4f459dd4546a27 (patch) | |
| tree | ac32b1aaaea8a3f78816eb296cb565d8c644f9ea | |
| parent | d8391778e9116bdb1f0c25a04d277688b53f0fb2 (diff) | |
| parent | c9ac00f96f41e92b9eb0d2997033ec210b5b0bf4 (diff) | |
Merge pull request #8534 from ksooo/jarvis-fix-pvr-json-rpc-input-select
[PVR, json-rpc] Fix Input.Select for PVR fullscreen windows
| -rw-r--r-- | xbmc/music/windows/GUIWindowVisualisation.cpp | 4 | ||||
| -rw-r--r-- | xbmc/video/windows/GUIWindowFullScreen.cpp | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/xbmc/music/windows/GUIWindowVisualisation.cpp b/xbmc/music/windows/GUIWindowVisualisation.cpp index df8a9eea91..ad16135bea 100644 --- a/xbmc/music/windows/GUIWindowVisualisation.cpp +++ b/xbmc/music/windows/GUIWindowVisualisation.cpp @@ -48,10 +48,10 @@ bool CGUIWindowVisualisation::OnAction(const CAction &action) { if (CSettings::GetInstance().GetBool(CSettings::SETTING_PVRPLAYBACK_CONFIRMCHANNELSWITCH) && g_infoManager.IsPlayerChannelPreviewActive() && - CButtonTranslator::GetInstance().GetGlobalAction(action.GetButtonCode()).GetID() == ACTION_SELECT_ITEM) + (action.GetID() == ACTION_SELECT_ITEM || CButtonTranslator::GetInstance().GetGlobalAction(action.GetButtonCode()).GetID() == ACTION_SELECT_ITEM)) { // If confirm channel switch is active, channel preview is currently shown - // and the button that caused this action matches global action "Select" (OK) + // and the button that caused this action matches (global) action "Select" (OK) // switch to the channel currently displayed within the preview. g_application.m_pPlayer->SwitchChannel(g_application.CurrentFileItem().GetPVRChannelInfoTag()); return true; diff --git a/xbmc/video/windows/GUIWindowFullScreen.cpp b/xbmc/video/windows/GUIWindowFullScreen.cpp index c3c3af733e..ac1dea40e4 100644 --- a/xbmc/video/windows/GUIWindowFullScreen.cpp +++ b/xbmc/video/windows/GUIWindowFullScreen.cpp @@ -124,10 +124,10 @@ bool CGUIWindowFullScreen::OnAction(const CAction &action) if (CSettings::GetInstance().GetBool(CSettings::SETTING_PVRPLAYBACK_CONFIRMCHANNELSWITCH) && g_infoManager.IsPlayerChannelPreviewActive() && - CButtonTranslator::GetInstance().GetGlobalAction(action.GetButtonCode()).GetID() == ACTION_SELECT_ITEM) + (action.GetID() == ACTION_SELECT_ITEM || CButtonTranslator::GetInstance().GetGlobalAction(action.GetButtonCode()).GetID() == ACTION_SELECT_ITEM)) { // If confirm channel switch is active, channel preview is currently shown - // and the button that caused this action matches global action "Select" (OK) + // and the button that caused this action matches (global) action "Select" (OK) // switch to the channel currently displayed within the preview. g_application.m_pPlayer->SwitchChannel(g_application.CurrentFileItem().GetPVRChannelInfoTag()); return true; |