aboutsummaryrefslogtreecommitdiffstats
path: root/build_tools
diff options
context:
space:
mode:
authorrussell <russell@f38db490-d61c-443f-a65b-d21fe96a405b>2006-05-10 13:05:17 +0000
committerrussell <russell@f38db490-d61c-443f-a65b-d21fe96a405b>2006-05-10 13:05:17 +0000
commita6b2177d50659d049694ca79f6cbe00f54dd0a93 (patch)
tree973f619b7e6d3f3ca5db07752e0d54656c2aaa6f /build_tools
parent91ad35ce5445a2f9c958968672338869bd4ce8a5 (diff)
remove a debug message and make the exit keys not be case sensitive
inside of a category menu git-svn-id: http://svn.digium.com/svn/asterisk/trunk@26441 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'build_tools')
-rw-r--r--build_tools/menuselect.c1
-rw-r--r--build_tools/menuselect_curses.c8
2 files changed, 5 insertions, 4 deletions
diff --git a/build_tools/menuselect.c b/build_tools/menuselect.c
index 9705af7fd..51f31b638 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 d8bedc202..bdb6cf93f 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);
}