From ddf7af235fecfc858c380d2c5b8779a1894ad63f Mon Sep 17 00:00:00 2001 From: Syndamia Date: Sun, 29 May 2022 08:23:55 +0300 Subject: Autocommit at 29.05.2022 @ 08:23 --- src/Generic/ConsoleInterface/Menu.cpp | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'src/Generic/ConsoleInterface/Menu.cpp') diff --git a/src/Generic/ConsoleInterface/Menu.cpp b/src/Generic/ConsoleInterface/Menu.cpp index cde9aae..18287f2 100644 --- a/src/Generic/ConsoleInterface/Menu.cpp +++ b/src/Generic/ConsoleInterface/Menu.cpp @@ -6,7 +6,7 @@ Menu::Menu() : menuOptions() {} unsigned indexOfCommandEnd(char* str) { unsigned ind = 0; - while (str[ind] != ' ') ind++; + while (str[ind] != ' ' && str[ind] != '\n' && str[ind] != '\0') ind++; return ind; } @@ -43,14 +43,15 @@ void Menu::navigate() const { unsigned commandEnd = indexOfCommandEnd(buffer), index = menuOptions.get_count(); + std::cout << commandEnd; for (unsigned i = 0; i < menuOptions.get_count(); i++) { - if (strncmp(buffer + startIndex, menuOptions[i].get_name(), commandEnd) == 0) { + if (strncmp(buffer, menuOptions[i].get_name(), commandEnd) == 0) { index = i; break; } } - if (index > menuOptions.get_count()) { + if (index == menuOptions.get_count()) { printLine("Invalid menu option!"); continue; } -- cgit v1.3.1-23-gd82d