From: Lars Op den Kamp <lars@opdenkamp.eu>
Date: Mon, 27 Feb 2012 13:23:36 +0000 (+0100)
Subject: cec: don't send an updated configuration back when initialising. let the client call... 
X-Git-Tag: upstream/2.2.0~1^2~33^2~21
X-Git-Url: https://git.piment-noir.org/?p=deb_libcec.git;a=commitdiff_plain;h=d465a51a29a9a81aade24ba75591b8bac1a57d0c

cec: don't send an updated configuration back when initialising. let the client call the GetCurrentConfiguration() method. bugzid: 459
---

diff --git a/src/LibCecSharp/LibCecSharp.cpp b/src/LibCecSharp/LibCecSharp.cpp
index 014dea0..d6154c3 100644
--- a/src/LibCecSharp/LibCecSharp.cpp
+++ b/src/LibCecSharp/LibCecSharp.cpp
@@ -80,8 +80,6 @@ namespace CecSharp
 			ConvertConfiguration(context, config, libCecConfig);
 
 			m_libCec = (ICECAdapter *) CECInitialise(&libCecConfig);
-			config->Update(libCecConfig);
-
 
 			delete context;
 			return m_libCec != NULL;
diff --git a/src/lib/CECProcessor.cpp b/src/lib/CECProcessor.cpp
index 3568c16..7c658a3 100644
--- a/src/lib/CECProcessor.cpp
+++ b/src/lib/CECProcessor.cpp
@@ -65,8 +65,6 @@ CCECProcessor::CCECProcessor(CLibCEC *controller, libcec_configuration *configur
 
   if (m_configuration.tvVendor != CEC_VENDOR_UNKNOWN)
     m_busDevices[CECDEVICE_TV]->ReplaceHandler(false);
-
-  GetCurrentConfiguration(configuration);
 }
 
 CCECProcessor::CCECProcessor(CLibCEC *controller, const char *strDeviceName, const cec_device_type_list &types, uint16_t iPhysicalAddress) :
diff --git a/src/lib/LibCEC.cpp b/src/lib/LibCEC.cpp
index f09843f..93a5019 100644
--- a/src/lib/LibCEC.cpp
+++ b/src/lib/LibCEC.cpp
@@ -560,7 +560,7 @@ const char *CLibCEC::ToString(const cec_server_version version)
 
 bool CLibCEC::GetCurrentConfiguration(libcec_configuration *configuration)
 {
-  return m_cec->GetCurrentConfiguration(configuration);
+  return m_cec->IsInitialised() && m_cec->GetCurrentConfiguration(configuration);
 }
 
 bool CLibCEC::SetConfiguration(const libcec_configuration *configuration)