From patchwork Mon Jan 16 17:07:36 2006
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
X-Patchwork-Submitter: Klaus Schmidinger <Klaus.Schmidinger@cadsoft.de>
X-Patchwork-Id: 12162
Received: from tiger.cadsoft.de ([217.7.101.210])
	by www.linuxtv.org with esmtp (Exim 4.50) id 1EyXpX-0008WK-20
	for vdr@linuxtv.org; Mon, 16 Jan 2006 18:07:43 +0100
Received: from raven.cadsoft.de (raven.cadsoft.de [217.7.101.211])
	by tiger.cadsoft.de (8.13.4/8.13.4) with ESMTP id k0GH7dFg004827
	for <vdr@linuxtv.org>; Mon, 16 Jan 2006 18:07:40 +0100
Received: from [192.168.100.10] (hawk.cadsoft.de [192.168.100.10])
	by raven.cadsoft.de (8.13.3/8.13.3) with ESMTP id k0GH7daG027639
	for <vdr@linuxtv.org>; Mon, 16 Jan 2006 18:07:39 +0100
Message-ID: <43CBD2D8.2040003@cadsoft.de>
Date: Mon, 16 Jan 2006 18:07:36 +0100
From: Klaus Schmidinger <Klaus.Schmidinger@cadsoft.de>
Organization: CadSoft Computer GmbH
User-Agent: Mozilla Thunderbird 1.0.6 (X11/20050716)
X-Accept-Language: en
MIME-Version: 1.0
To: vdr@linuxtv.org
Subject: Re: [vdr] problem with VDR 1.3.39
References: <43CB9915.6040201@unterbrecher.de>
In-Reply-To: <43CB9915.6040201@unterbrecher.de>
X-Greylist: Sender DNS name whitelisted, not delayed by milter-greylist-2.0.2
	(tiger.cadsoft.de [217.7.101.210]);
	Mon, 16 Jan 2006 18:07:40 +0100 (CET)
X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-2.0
	(raven.cadsoft.de [192.168.1.1]);
	Mon, 16 Jan 2006 18:07:39 +0100 (CET)
X-BeenThere: vdr@linuxtv.org
X-Mailman-Version: 2.1.5
Precedence: list
Reply-To: VDR Mailing List <vdr@linuxtv.org>
List-Id: VDR Mailing List <vdr.linuxtv.org>
List-Unsubscribe: <http://www.linuxtv.org/cgi-bin/mailman/listinfo/vdr>,
	<mailto:vdr-request@linuxtv.org?subject=unsubscribe>
List-Archive: <http://www.linuxtv.org/pipermail/vdr>
List-Post: <mailto:vdr@linuxtv.org>
List-Help: <mailto:vdr-request@linuxtv.org?subject=help>
List-Subscribe: <http://www.linuxtv.org/cgi-bin/mailman/listinfo/vdr>,
	<mailto:vdr-request@linuxtv.org?subject=subscribe>
X-List-Received-Date: Mon, 16 Jan 2006 17:07:43 -0000
Status: O
X-Status: 
X-Keywords: 
X-UID: 7238

Peter Juszack wrote:
> Hi list,
> 
>    after updating to 1.3.39 vdr did react on keys any more. With 1.3.38 
> everything worked fine.
> 
> in syslog I discovered the following
> 
> Jan 16 13:47:32 fontina vdr[4440]: ERROR: unknown plugin 'snapshot'
> Jan 16 13:48:03 fontina last message repeated 341237 times
> Jan 16 13:48:05 fontina last message repeated 33642 times
> 
> after some searching I discovered that the snapshot plugin remained in 
> the keymacros.conf allthough I
> have uninstalled it.
> After I tidied up the keymacros.conf everything is fine.

Here's a fix:



Actually either one of these changes will do, but it's certainly not
a bad idea to make cKeyMacros::Get() "kNone-safe" as well.

Klaus

--- keys.c      2006/01/05 15:39:26     1.10
+++ keys.c      2006/01/16 17:01:25
@@ -250,9 +250,11 @@

  const cKeyMacro *cKeyMacros::Get(eKeys Key)
  {
-  for (cKeyMacro *k = First(); k; k = Next(k)) {
-      if (*k->Macro() == Key)
-         return k;
-      }
+  if (Key != kNone) {
+     for (cKeyMacro *k = First(); k; k = Next(k)) {
+         if (*k->Macro() == Key)
+            return k;
+         }
+     }
    return NULL;
  }
--- vdr.c       2006/01/15 16:23:21     1.240
+++ vdr.c       2006/01/16 17:05:49
@@ -985,7 +985,7 @@
             }
          else {
             // Key functions in "normal" viewing mode:
-           if (KeyMacros.Get(key)) {
+           if (key != kNone && KeyMacros.Get(key)) {
                cRemote::PutMacro(key);
                key = kNone;
                }