From: Lars Op den Kamp <lars@opdenkamp.eu>
Date: Fri, 11 Nov 2011 22:36:53 +0000 (+0100)
Subject: Merge branch 'master' into release
X-Git-Tag: upstream/2.2.0~1^2~46
X-Git-Url: https://git.piment-noir.org/?a=commitdiff_plain;h=8f29b7e16395fe448c235ed793e93cb19cafe02c;hp=f0197d4f74f204df28c96dd789edb0984cd979db;p=deb_libcec.git

Merge branch 'master' into release
---

diff --git a/ChangeLog b/ChangeLog
index 8af478c..78040e0 100644
--- 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 8af478c..78040e0 100644
--- 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 8247eb3..bdcb4d3 100644
--- 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;