[PATCH BlueZ 1/4] shared/shell: Fix hidden default menu if no submenu

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



Also fixes the output of the default menu in the help command of obexctl.
---
 src/shared/shell.c | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/shared/shell.c b/src/shared/shell.c
index a4be844b7..f9dbdb194 100644
--- a/src/shared/shell.c
+++ b/src/shared/shell.c
@@ -198,8 +198,9 @@ static void shell_print_menu(void)
 		/* Skip menu command if not on main menu or if there are no
 		 * submenus.
 		 */
-		if ((data.menu != data.main && !strcmp(entry->cmd, "menu")) ||
-					queue_isempty(data.submenus))
+		if (!strcmp(entry->cmd, "menu") &&
+			(data.menu != data.main ||
+				queue_isempty(data.submenus)))
 			continue;
 
 		/* Skip back command if on main menu */
-- 
2.14.1

--
To unsubscribe from this list: send the line "unsubscribe linux-bluetooth" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html



[Index of Archives]     [Bluez Devel]     [Linux Wireless Networking]     [Linux Wireless Personal Area Networking]     [Linux ATH6KL]     [Linux USB Devel]     [Linux Media Drivers]     [Linux Audio Users]     [Linux Kernel]     [Linux SCSI]     [Big List of Linux Books]

  Powered by Linux