Permalink
Browse files

Merge pull request #3808 from opdenkamp/cec-fixes

CEC fixes
  • Loading branch information...
2 parents 70ef5d7 + 3d03da0 commit 108e917365899ddebce16e33f092d0b13a4bf65d Lars Op den Kamp committed Dec 11, 2013
Showing with 8 additions and 2 deletions.
  1. +8 −2 xbmc/peripherals/devices/PeripheralCecAdapter.cpp
@@ -705,6 +705,7 @@ int CPeripheralCecAdapter::CecAlert(void *cbParam, const libcec_alert alert, con
iAlertString = 36027;
break;
case CEC_ALERT_CONNECTION_LOST:
+ bReopenConnection = true;
iAlertString = 36030;
break;
#if defined(CEC_ALERT_PERMISSION_ERROR)
@@ -1675,12 +1676,17 @@ void CPeripheralCecAdapter::ProcessStandbyDevices(void)
CSingleLock lock(m_critSection);
bStandby = m_bStandbyPending;
m_bStandbyPending = false;
+ if (bStandby)
+ m_bGoingToStandby = true;
}
if (bStandby)
{
- m_cecAdapter->StandbyDevices(CECDEVICE_BROADCAST);
- if (m_configuration.bSendInactiveSource == 1)
+ if (!m_configuration.powerOffDevices.IsEmpty())
+ {
+ m_cecAdapter->StandbyDevices(CECDEVICE_BROADCAST);
+ }
+ else if (m_configuration.bSendInactiveSource == 1)
{
CLog::Log(LOGDEBUG, "%s - sending inactive source commands", __FUNCTION__);
m_cecAdapter->SetInactiveView();

0 comments on commit 108e917

Please sign in to comment.