Merge branch 'master' into release

[deb_libcec.git] / src / lib / implementations / VLCommandHandler.cpp

diff --git a/src/lib/implementations/VLCommandHandler.cpp b/src/lib/implementations/VLCommandHandler.cpp
index f57925b80fc87247f959d8fd50474e127dddc088..21dc42ef448ae5dbad2070c1a8a6c446f006ef92 100644 (file)
--- a/src/lib/implementations/VLCommandHandler.cpp
+++ b/src/lib/implementations/VLCommandHandler.cpp
@@ -76,6 +76,14 @@ bool CVLCommandHandler::InitHandler(void)
     {
       if (primary && m_busDevice->GetLogicalAddress() != primary->GetLogicalAddress())
       {
+        libcec_configuration config;
+        m_processor->GetPrimaryClient()->GetCurrentConfiguration(config);
+        if (config.iDoubleTapTimeoutMs == 0)
+        {
+          config.iDoubleTapTimeoutMs = CEC_DOUBLE_TAP_TIMEOUT_MS;
+          m_processor->GetPrimaryClient()->SetConfiguration(config);
+        }
+
         primary->SetVendorId(CEC_VENDOR_PANASONIC);
         primary->ReplaceHandler(false);
       }