repositories
/
deb_libcec.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
cec: and now correct
[deb_libcec.git]
/
src
/
lib
/
CECProcessor.cpp
diff --git
a/src/lib/CECProcessor.cpp
b/src/lib/CECProcessor.cpp
index 9fc11fdf30c3b97f16469e256e7339bd510d03c6..ae0a013634e98962c9bc46372f63e9b688071122 100644
(file)
--- a/
src/lib/CECProcessor.cpp
+++ b/
src/lib/CECProcessor.cpp
@@
-252,7
+252,8
@@
bool CCECProcessor::Initialise(void)
m_busDevices[m_logicalAddresses.primary]->ActivateSource();
SetInitialised(bReturn);
m_busDevices[m_logicalAddresses.primary]->ActivateSource();
SetInitialised(bReturn);
- CLibCEC::ConfigurationChanged(m_configuration);
+ if (bReturn)
+ CLibCEC::ConfigurationChanged(m_configuration);
return bReturn;
}
return bReturn;
}
@@
-1362,6
+1363,8
@@
const char *CCECProcessor::ToString(const cec_vendor_id vendor)
return "Philips";
case CEC_VENDOR_SONY:
return "Sony";
return "Philips";
case CEC_VENDOR_SONY:
return "Sony";
+ case CEC_VENDOR_TOSHIBA:
+ return "Toshiba";
default:
return "Unknown";
}
default:
return "Unknown";
}