From patchwork Mon Sep 26 12:56:53 2005
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
X-Patchwork-Submitter: Sascha Volkenandt <lists@magoa.net>
X-Patchwork-Id: 12043
Received: from mailout05.sul.t-online.com ([194.25.134.82])
	by www.linuxtv.org with esmtp (Exim 4.50) id 1EJsU5-0004Yz-Q8
	for vdr@linuxtv.org; Mon, 26 Sep 2005 14:53:29 +0200
Received: from fwd30.aul.t-online.de by mailout05.sul.t-online.com with smtp
	id 1EJsU5-0002eJ-02; Mon, 26 Sep 2005 14:53:29 +0200
Received: from transwarp
	(E1C4wMZFoeFSRy8kEgkF0+Wb-zv7x9ta9+1SaNDBrz4cyrji+AeC8-@[80.142.64.185])
	by fwd30.sul.t-online.de
	with esmtp id 1EJsTp-27yvNw0; Mon, 26 Sep 2005 14:53:13 +0200
From: Sascha Volkenandt <lists@magoa.net>
To: Klaus Schmidinger's VDR <vdr@linuxtv.org>
Date: Mon, 26 Sep 2005 14:56:53 +0200
User-Agent: KMail/1.8
MIME-Version: 1.0
Message-Id: <200509261456.53360.lists@magoa.net>
X-ID: E1C4wMZFoeFSRy8kEgkF0+Wb-zv7x9ta9+1SaNDBrz4cyrji+AeC8-@t-dialin.net
X-TOI-MSGID: 34cfc1b8-5a96-43d6-a95d-364373d5d1ed
Subject: [vdr] Patch #3 Correction
X-BeenThere: vdr@linuxtv.org
X-Mailman-Version: 2.1.5
Precedence: list
Reply-To: sascha@akv-soft.de, 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: Mon, 26 Sep 2005 12:53:29 -0000
Status: O
X-Status: 
X-Keywords: 
X-UID: 5147

Hi list,

Patch #3 was broken so that it created a file menu.c.orig. Here is the correct 
version. If you applied it already, please delete menu.c.orig afterwards.

Greetings,
Sascha Volkenandt

diff -Nru vdr-1.3.33-orig/menu.c vdr-1.3.33/menu.c
--- vdr-1.3.33-orig/menu.c	Sun Sep 25 15:37:21 2005
+++ vdr-1.3.33/menu.c	Mon Sep 26 14:49:25 2005
@@ -1267,7 +1267,11 @@
 
 eOSState cMenuCommands::ProcessKey(eKeys Key)
 {
+  bool hadSubMenu = HasSubMenu();
   eOSState state = cOsdMenu::ProcessKey(Key);
+
+  if (hadSubMenu && !HasSubMenu())
+	  return osBack;
 
   if (state == osUnknown) {
      switch (Key) {