Merge branch 'master' into release

diff --git a/ChangeLog b/ChangeLog
index 8af478c706e8b24ecc61d51272a5673edcae0ec1..78040e018cec3acb619220cabdfac76b241d3393 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+libcec (1.1-3) unstable; urgency=low
+
+  * fixed return value in CCECProcessor::SetStreamPath(), which prevented
+    active source and menu state from being sent
+
+ -- Pulse-Eight Packaging <packaging@pulse-eight.com>  Fri, 11 Nov 2011 23:36:00 +0100
+
 libcec (1.1-2) unstable; urgency=low
 
   * forgot to update the headers to v1.1

diff --git a/debian/changelog b/debian/changelog
index 8af478c706e8b24ecc61d51272a5673edcae0ec1..78040e018cec3acb619220cabdfac76b241d3393 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+libcec (1.1-3) unstable; urgency=low
+
+  * fixed return value in CCECProcessor::SetStreamPath(), which prevented
+    active source and menu state from being sent
+
+ -- Pulse-Eight Packaging <packaging@pulse-eight.com>  Fri, 11 Nov 2011 23:36:00 +0100
+
 libcec (1.1-2) unstable; urgency=low
 
   * forgot to update the headers to v1.1

diff --git a/src/lib/CECProcessor.cpp b/src/lib/CECProcessor.cpp
index 8247eb35ba7ba0e9f7a3de9f445a3e998f0e6eb8..bdcb4d3e816deadbde7385d1dbab0c91e40ddbde 100644 (file)
--- a/src/lib/CECProcessor.cpp
+++ b/src/lib/CECProcessor.cpp
@@ -364,6 +364,8 @@ bool CCECProcessor::SetStreamPath(uint16_t iStreamPath)
 
     device->m_bActiveSource = true;
     device->m_powerStatus   = CEC_POWER_STATUS_ON;
+
+    bReturn = true;
   }
 
   return bReturn;