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

Origin commit data
------------------
Commit: aa1e28cfa8
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-12-01 (Fri, 01 Dec 2017)
This commit is contained in:
vanhofen
2017-12-01 13:06:22 +01:00

View File

@@ -94,10 +94,12 @@ void CVolume::setVolume(const neutrino_msg_t key)
{
if (!g_RCInput) /* don't die... */
return;
int mode = CNeutrinoApp::getInstance()->getMode();
if (mode == NeutrinoModes::mode_standby)
return;
neutrino_msg_t msg = key;
static bool do_vol = true; /* false if volume is handled by external script */
int mode = CNeutrinoApp::getInstance()->getMode();
if (msg <= CRCInput::RC_MaxRC) {
if(m_mode != mode) {
m_mode = mode;