cec: don't send an updated configuration back when initialising. let the client call...

diff --git a/src/LibCecSharp/LibCecSharp.cpp b/src/LibCecSharp/LibCecSharp.cpp
index 014dea00741571e7d6b9c2af440d5ab83551e2df..d6154c36cfe09ddb733b9d37bd08bd0dca4cc0aa 100644 (file)
--- 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 3568c16fb8b18c1997b1ffb7d788c5a032da28c9..7c658a35d17f6a67baa238575230286413a0358f 100644 (file)
--- 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 f09843ff87090da4ff04b8d6ff4befe234f16d43..93a50198a3bcac9331b72a0014d61df1dc3db4a4 100644 (file)
--- 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)