From patchwork Wed Jan 18 06:18:11 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Heiko Schocher X-Patchwork-Id: 136556 X-Patchwork-Delegate: vapier@gentoo.org Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from theia.denx.de (theia.denx.de [85.214.87.163]) by ozlabs.org (Postfix) with ESMTP id DA5E9B6F71 for ; Wed, 18 Jan 2012 17:18:24 +1100 (EST) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 53B3A2830D; Wed, 18 Jan 2012 07:18:23 +0100 (CET) X-Virus-Scanned: Debian amavisd-new at theia.denx.de Received: from theia.denx.de ([127.0.0.1]) by localhost (theia.denx.de [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id Q4wCNTtrrvEc; Wed, 18 Jan 2012 07:18:23 +0100 (CET) Received: from theia.denx.de (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id C5DAC28305; Wed, 18 Jan 2012 07:18:17 +0100 (CET) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 683BA28305 for ; Wed, 18 Jan 2012 07:18:15 +0100 (CET) X-Virus-Scanned: Debian amavisd-new at theia.denx.de Received: from theia.denx.de ([127.0.0.1]) by localhost (theia.denx.de [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id BDXP6LQrcZ5d for ; Wed, 18 Jan 2012 07:18:15 +0100 (CET) X-policyd-weight: NOT_IN_SBL_XBL_SPAMHAUS=-1.5 NOT_IN_SPAMCOP=-1.5 NOT_IN_BL_NJABL=-1.5 (only DNSBL check requested) Received: from pollux.denx.de (host-82-135-33-74.customer.m-online.net [82.135.33.74]) by theia.denx.de (Postfix) with ESMTP id 0D66628301 for ; Wed, 18 Jan 2012 07:18:13 +0100 (CET) Received: by pollux.denx.de (Postfix, from userid 515) id 31C0C322574; Wed, 18 Jan 2012 07:18:13 +0100 (CET) From: Heiko Schocher To: u-boot@lists.denx.de Date: Wed, 18 Jan 2012 07:18:11 +0100 Message-Id: <1326867491-20038-1-git-send-email-hs@denx.de> X-Mailer: git-send-email 1.7.7.5 In-Reply-To: <1326788669-23493-1-git-send-email-hs@denx.de> References: <1326788669-23493-1-git-send-email-hs@denx.de> Cc: Heiko Schocher Subject: [U-Boot] [PATCH v2] common, menu: do not timeout again if an item was selected but not found X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.11 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: u-boot-bounces@lists.denx.de Errors-To: u-boot-bounces@lists.denx.de Signed-off-by: Heiko Schocher Acked-by: Jason Hobbs Cc: Mike Frysinger --- - changes for v2: - add Acked-by from Jason Hobbs - add comment from Mike Frysinger: - respell summary text --- common/menu.c | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/common/menu.c b/common/menu.c index 754a9f9..aa16c9a 100644 --- a/common/menu.c +++ b/common/menu.c @@ -236,8 +236,10 @@ static inline int menu_interactive_choice(struct menu *m, void **choice) if (readret >= 0) { choice_item = menu_item_by_key(m, cbuf); - if (!choice_item) + if (!choice_item) { printf("%s not found\n", cbuf); + m->timeout = 0; + } } else { puts("^C\n"); return -EINTR;