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

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

Browse Source 
Origin commit data
------------------
Commit: 32414b6a48
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-10-11 (Wed, 11 Oct 2017)
This commit is contained in:
vanhofen
2017-10-11 20:58:45 +02:00
parent 9d5ad038f5 2f8ff62802
commit 659076d4e0
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

@@ -1539,7 +1539,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;
@@ -1566,7 +1566,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;