From 9ef312f888aae6167bf210d0d1bb8fcb9b787584 Mon Sep 17 00:00:00 2001 From: Klaus Schmidinger Date: Sun, 15 Oct 2006 18:00:00 +0200 Subject: Version 1.4.3-2 - Fixed clearing an event's Title, ShortText and Description in case the data comes from an external source. - Updated the Hungarian language texts (thanks to Guido Josten). - Fixed a possible crash if cPluginManager::GetPlugin() is called with a NULL pointer (thanks to Petri Hintukainen). - Fixed displaying the error log message in case an unknown plugin was requested in a key macro (thanks to Petri Hintukainen). - Keys from expanded key macros are now put into the front of the key queue to avoid problems if the queue is not empty at that time (based on a patch from Petri Hintukainen). - cKeyMacro now has an explicit counter for the number of keys it contains. - cRemote::PutMacro() now sets a lock while it expands the macro (thanks to Petri Hintukainen). - Fixed handling plugins from cRemote::PutMacro() and cRemote::CallPlugin() (based on a patch from Petri Hintukainen). - Increased the size of the key queue to avoid problems with long key macros. --- keys.c | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) (limited to 'keys.c') diff --git a/keys.c b/keys.c index 6ebdbfe..577dae2 100644 --- a/keys.c +++ b/keys.c @@ -4,7 +4,7 @@ * See the main source file 'vdr.c' for copyright information and * how to reach the author. * - * $Id: keys.c 1.13 2006/04/15 13:50:43 kls Exp $ + * $Id: keys.c 1.14 2006/10/14 10:18:05 kls Exp $ */ #include "keys.h" @@ -186,8 +186,9 @@ void cKeys::PutSetup(const char *Remote, const char *Setup) cKeyMacro::cKeyMacro(void) { + numKeys = 0; for (int i = 0; i < MAXKEYSINMACRO; i++) - macro[i] = kNone; + macro[i] = kNone; // for compatibility with old code that doesn't know about NumKeys() plugin = NULL; } @@ -241,9 +242,9 @@ bool cKeyMacro::Parse(char *s) return false; } } - if (n < 2) { - esyslog("ERROR: empty key macro"); - } + if (n < 2) + esyslog("ERROR: empty key macro"); // non fatal + numKeys = n; return true; } -- cgit v1.2.3