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

diff --git a/build_tools/menuselect.c b/build_tools/menuselect.c
index 9705af7fdc6848c3da7344f6afcb58362d5fc784..51f31b6385b8875a12539cffdfac66ac58725e1c 100644 (file)
--- 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 d8bedc2024bdd8b0a7348f794cee3d471eba032f..bdb6cf93f9a0a747deb5170e0f37f1ba3b671262 100644 (file)
--- 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);
        }