X-Git-Url: https://git.piment-noir.org/?a=blobdiff_plain;f=src%2Flib%2Fimplementations%2FVLCommandHandler.cpp;h=44feabc4f4e5efe0e6cd74739121605646ca74fd;hb=a604c2182886d2ce8e8d930546b36289956e4b4f;hp=b7cdb7a20b166ab84a1ccca5abe27a3d39335dc4;hpb=37383dcc860665341ec1c68e144d6c60551c2dc0;p=deb_libcec.git

diff --git a/src/lib/implementations/VLCommandHandler.cpp b/src/lib/implementations/VLCommandHandler.cpp
index b7cdb7a..44feabc 100644
--- a/src/lib/implementations/VLCommandHandler.cpp
+++ b/src/lib/implementations/VLCommandHandler.cpp
@@ -1,7 +1,7 @@
 /*
  * This file is part of the libCEC(R) library.
  *
- * libCEC(R) is Copyright (C) 2011-2012 Pulse-Eight Limited.  All rights reserved.
+ * libCEC(R) is Copyright (C) 2011-2013 Pulse-Eight Limited.  All rights reserved.
  * libCEC(R) is an original work, containing original code.
  *
  * libCEC(R) is a trademark of Pulse-Eight Limited.
@@ -76,13 +76,21 @@ 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);
       }
-    }
 
-    if (primary->GetType() == CEC_DEVICE_TYPE_RECORDING_DEVICE)
-      return m_processor->GetPrimaryClient()->ChangeDeviceType(CEC_DEVICE_TYPE_RECORDING_DEVICE, CEC_DEVICE_TYPE_PLAYBACK_DEVICE);
+      if (primary->GetType() == CEC_DEVICE_TYPE_RECORDING_DEVICE)
+        return m_processor->GetPrimaryClient()->ChangeDeviceType(CEC_DEVICE_TYPE_RECORDING_DEVICE, CEC_DEVICE_TYPE_PLAYBACK_DEVICE);
+    }
   }
 
   return CCECCommandHandler::InitHandler();