mirrors/recycled-ni-neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-fork-migrations/recycled-ni-neutrino.git synced 2025-09-02 18:31:12 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox

Browse Source 
Origin commit data
------------------
Branch: ni/coolstream
Commit: a6de24c7b7
Author: gixxpunk <thomas.harfmann@gmail.com>
Date: 2017-10-11 (Wed, 11 Oct 2017)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
This commit is contained in:
gixxpunk
2017-10-11 21:35:55 +02:00
parent 6893c77389 2379818d0c
commit 440a301827
6 changed files with 52 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/gui/movieplayer.cpp
View File

@@ -1302,7 +1302,7 @@ void CMoviePlayerGui::quickZap(neutrino_msg_t msg)
if ((msg == CRCInput::RC_right) || msg == (neutrino_msg_t) g_settings.key_quickzap_up)
{
//printf("CMoviePlayerGui::%s: CRCInput::RC_right or g_settings.key_quickzap_up\n", __func__);
if (isLuaPlay)
if (isLuaPlay || isUPNP)
{
playstate = CMoviePlayerGui::STOPPED;
keyPressed = CMoviePlayerGui::PLUGIN_PLAYSTATE_NEXT;
@@ -1329,7 +1329,7 @@ void CMoviePlayerGui::quickZap(neutrino_msg_t msg)
else if ((msg == CRCInput::RC_left) || msg == (neutrino_msg_t) g_settings.key_quickzap_down)
{
//printf("CMoviePlayerGui::%s: CRCInput::RC_left or g_settings.key_quickzap_down\n", __func__);
if (isLuaPlay)
if (isLuaPlay || isUPNP)
{
playstate = CMoviePlayerGui::STOPPED;
keyPressed = CMoviePlayerGui::PLUGIN_PLAYSTATE_PREV;