Fixed learning keyboard remote control codes

3 files changed, 5 insertions, 3 deletions

diff --git a/CONTRIBUTORS b/CONTRIBUTORS
index 2718c3c9..50068839 100644
--- a/CONTRIBUTORS
+++ b/CONTRIBUTORS
@@ -2861,6 +2861,7 @@ Lars Hanisch <dvb@flensrocker.de>
  for reporting a possible crash if the recordings list is updated externally while the
  Recordings menu is open
  for reporting a missing closing ')' in the help entry of the --vfat option
+ for fixing learning keyboard remote control codes
 
 Alex Lasnier <alex@fepg.org>
  for adding tuning support for ATSC devices
diff --git a/HISTORY b/HISTORY
index acb0e45a..105dd7f3 100644
--- a/HISTORY
+++ b/HISTORY
@@ -7870,7 +7870,7 @@ Video Disk Recorder Revision History
   and also to use the correct directory with --edit (the latter reported by Marko
   Mäkelä).
 
-2014-02-06: Version 2.0.6
+2014-02-15: Version 2.0.6
 
 - Updated 'sources.conf' (thanks to Antti Hartikainen).
 - cFont::CreateFont() now returns a dummy font in case there are no fonts installed.
@@ -7890,3 +7890,4 @@ Video Disk Recorder Revision History
 - Fixed clearing non-editable members in the channel editor (thanks to Rolf Ahrenberg).
 - Fixed flickering if subtitles are active while the OSD demo is running.
 - Fixed a possible crash in the OSD demo (reported by Christopher Reimer).
+- Fixed learning keyboard remote control codes (thanks to Lars Hanisch).
diff --git a/remote.c b/remote.c
index f3d90c96..a6e9a652 100644
--- a/remote.c
+++ b/remote.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: remote.c 2.8 2013/02/03 15:44:55 kls Exp $
+ * $Id: remote.c 2.8.1.1 2014/02/15 12:44:48 kls Exp $
  */
 
 #include "remote.h"
@@ -297,7 +297,7 @@ int cKbdRemote::MapCodeToFunc(uint64_t Code)
 
 void cKbdRemote::PutKey(uint64_t Code, bool Repeat, bool Release)
 {
-  if (rawMode || !Put(Code, Repeat, Release)) {
+  if (rawMode || (!Put(Code, Repeat, Release) && !IsLearning())) {
      if (int func = MapCodeToFunc(Code))
         Put(KBDKEY(func), Repeat, Release);
      }