diff --git a/tui/main.cpp b/tui/main.cpp index 7836ca6..e975645 100644 --- a/tui/main.cpp +++ b/tui/main.cpp @@ -78,7 +78,7 @@ void mainmenu(WINDOW *window) { mvwaddstr(window, 5, 2, "3. Wireless"); cyan(window); - mvwaddstr(window, 7, 2, "0. Quit"); + mvwaddstr(window, 7, 2, "q. Quit"); magenta(window); mvwaddstr(window, 9, 2, "Enter selection: "); @@ -88,7 +88,9 @@ void mainmenu(WINDOW *window) { char c = getch(); if(c < '0' || c > '3') { - mainmenu(window); + if(c != 27 && c != 'q') { // allow escape in addition to 0 for quit + mainmenu(window); + } }else{ if(c == '1') { interfaceMenu(window); @@ -157,10 +159,12 @@ void arpMenu(WINDOW *window) { arpChar: char c = getch(); - if(c != '0') { + if(c != '0' && c != 27 && c != 'q') { goto arpChar; }else{ - mainmenu(window); + if(c != 'q') { + mainmenu(window); + } } } @@ -202,13 +206,16 @@ void interfaceMenu(WINDOW *window) { mvwaddstr(window, y + 1, 2, "0. Back to main menu"); magenta(window); - mvwaddstr(window, y + 3, 2, "Enter selection: "); + mvwaddstr(window, y + 3, 2, "q. Quit"); + mvwaddstr(window, y + 5, 2, "Enter selection: "); wrefresh(window); char c = getch(); if(c < '0' || c > lastInterface) { - interfaceMenu(window); + if(c != 'q') { + interfaceMenu(window); + } }else{ if(c == '0') { mainmenu(window); @@ -272,8 +279,7 @@ void interfaceSelect(WINDOW *window, QString interface) { if(c < '0' || c > (count + '0' - 1)) { if(c == 'q') { - quit(window); - exit(0); + // no-op, just quit }else if(c == 'a') { wdeleteln(window); mvwaddstr(window, y + 7, 2, "Enter IP address to add: ");