From 8e897e1a531bb1d63a7c53bd367e97e8b2fa0952 Mon Sep 17 00:00:00 2001
From: Russell Bryant <russell@russellbryant.com>
Date: Wed, 10 May 2006 13:05:17 +0000
Subject: [PATCH] remove a debug message and make the exit keys not be case
sensitive inside of a category menu
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@26441 65c4cc65-6c06-0410-ace0-fbb531ad65f3
---
build_tools/menuselect.c | 1 -
build_tools/menuselect_curses.c | 8 +++++---
2 files changed, 5 insertions(+), 4 deletions(-)
diff --git a/build_tools/menuselect.c b/build_tools/menuselect.c
index 9705af7fdc..51f31b6385 100644
--- a/build_tools/menuselect.c
+++ b/build_tools/menuselect.c
@@ -726,6 +726,5 @@ int main(int argc, char *argv[])
if (force_clean)
unlink(".lastclean");
- fprintf(stderr, "\nmenuselect about to exit with res %d\n", res);
exit(res);
}
diff --git a/build_tools/menuselect_curses.c b/build_tools/menuselect_curses.c
index d8bedc2024..bdb6cf93f9 100644
--- a/build_tools/menuselect_curses.c
+++ b/build_tools/menuselect_curses.c
@@ -143,9 +143,11 @@ void draw_category_menu(WINDOW *menu, struct category *cat, int start, int end,
snprintf(buf, sizeof(buf), "XXX %d.%s %s", i, i < 10 ? " " : "", mem->name);
else
snprintf(buf, sizeof(buf), "[%s] %d.%s %s", mem->enabled ? "*" : " ", i, i < 10 ? " " : "", mem->name);
- if (curopt + 1== i)
- desc = mem->displayname;
waddstr(menu, buf);
+
+ if (curopt + 1 == i)
+ desc = mem->displayname;
+
if (i == end)
break;
}
@@ -227,7 +229,7 @@ int run_category_menu(WINDOW *menu, int cat_num)
default:
break;
}
- if (c == 'x' || c == 'q')
+ if (c == 'x' || c == 'X' || c == 'Q' || c == 'q')
break;
draw_category_menu(menu, cat, start, end, curopt);
}
--
GitLab