repositories
/
deb_libcec.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
8b5e50e
)
cec: fixed possible crash when in CLibCEC::IsLibCECActiveSource() when libCEC doesn...
author
Lars Op den Kamp
<lars@opdenkamp.eu>
Tue, 20 Mar 2012 16:08:28 +0000
(17:08 +0100)
committer
Lars Op den Kamp
<lars@opdenkamp.eu>
Tue, 20 Mar 2012 16:08:28 +0000
(17:08 +0100)
src/lib/LibCEC.cpp
patch
|
blob
|
blame
|
history
diff --git
a/src/lib/LibCEC.cpp
b/src/lib/LibCEC.cpp
index aeb16e2a5b55abb90423c2f4220b3cac52f9feca..dd8624aeb13b38506385d14078286f8c0ae1a6b5 100644
(file)
--- a/
src/lib/LibCEC.cpp
+++ b/
src/lib/LibCEC.cpp
@@
-614,9
+614,14
@@
void CLibCEC::RescanActiveDevices(void)
bool CLibCEC::IsLibCECActiveSource(void)
{
bool CLibCEC::IsLibCECActiveSource(void)
{
- return m_cec ?
- m_cec->m_busDevices[m_cec->GetActiveSource()]->GetStatus(false) == CEC_DEVICE_STATUS_HANDLED_BY_LIBCEC :
- false;
+ bool bReturn(false);
+ if (m_cec)
+ {
+ cec_logical_address activeSource = m_cec->GetActiveSource();
+ if (activeSource != CECDEVICE_UNKNOWN)
+ bReturn = m_cec->m_busDevices[activeSource]->GetStatus(false) == CEC_DEVICE_STATUS_HANDLED_BY_LIBCEC;
+ }
+ return bReturn;
}
cec_device_type CLibCEC::GetType(cec_logical_address address)
}
cec_device_type CLibCEC::GetType(cec_logical_address address)