From patchwork Fri Nov  4 13:51:01 2005
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 8bit
X-Patchwork-Submitter: Klaus Schmidinger <Klaus.Schmidinger@cadsoft.de>
X-Patchwork-Id: 12081
Received: from tiger.cadsoft.de ([217.7.101.210])
	by www.linuxtv.org with esmtp (Exim 4.50) id 1EY1yG-0002L1-7c
	for vdr@linuxtv.org; Fri, 04 Nov 2005 14:51:08 +0100
Received: from raven.cadsoft.de (raven.cadsoft.de [217.7.101.211])
	by tiger.cadsoft.de (8.12.7/8.12.7) with ESMTP id jA4Dp6Ii010630
	for <vdr@linuxtv.org>; Fri, 4 Nov 2005 14:51:07 +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 jA4Dp5PS002869
	for <vdr@linuxtv.org>; Fri, 4 Nov 2005 14:51:05 +0100
Message-ID: <436B6745.10506@cadsoft.de>
Date: Fri, 04 Nov 2005 14:51:01 +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] Repeatable vdr 1.3.35 crash at end of recording
References: <20051103191925.GA104343@kosh.hut.fi>
In-Reply-To: <20051103191925.GA104343@kosh.hut.fi>
X-Greylist: Sender DNS name whitelisted, not delayed by milter-greylist-2.0
	(tiger.cadsoft.de [217.7.101.210]);
	Fri, 04 Nov 2005 14:51:07 +0100 (CET)
X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-2.0
	(raven.cadsoft.de [192.168.1.1]);
	Fri, 04 Nov 2005 14:51:06 +0100 (CET)
X-MIME-Autoconverted: from 8bit to quoted-printable by tiger.cadsoft.de id
	jA4Dp6Ii010630
X-BeenThere: vdr@linuxtv.org
X-Mailman-Version: 2.1.5
Precedence: list
Reply-To: Klaus Schmidinger's VDR <vdr@linuxtv.org>
List-Id: Klaus Schmidinger's VDR <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: Fri, 04 Nov 2005 13:51:08 -0000
Status: O
X-Status: 
X-Keywords: 
X-UID: 5874

Marko Mäkelä wrote:
> ...
> BTW, is there a reason why VDR discards the currently displayed menu
> at the end of a recording?

Not really, it just arose that way.

This should fix it:




Klaus

--- vdr.c       2005/10/09 10:01:45     1.218
+++ vdr.c       2005/11/04 13:48:39
@@ -813,8 +813,14 @@
          if (Interact) {
             eOSState state = Interact->ProcessKey(key);
             if (state == osUnknown && Interact != cControl::Control()) {
-              if (ISMODELESSKEY(key) && cControl::Control())
+              if (ISMODELESSKEY(key) && cControl::Control()) {
                   state = cControl::Control()->ProcessKey(key);
+                 if (state == osEnd) {
+                    // let's not close a menu when replay ends:
+                    cControl::Shutdown();
+                    continue;
+                    }
+                 }
                else if (time(NULL) - LastActivity > MENUTIMEOUT)
                   state = osEnd;
                }