From 3f000cb343d92fcede603d84217f03badded9465 Mon Sep 17 00:00:00 2001 From: "simon.kagstrom" Date: Sun, 19 Apr 2009 13:00:59 +0000 Subject: [PATCH] Fix select_one --- Src/menu.cpp | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/Src/menu.cpp b/Src/menu.cpp index 7dd9a23..95eba71 100644 --- a/Src/menu.cpp +++ b/Src/menu.cpp @@ -538,18 +538,6 @@ static int get_next_seq_y(menu_t *p_menu, int v, int dy) return v + dy; } -static void select_one(menu_t *p_menu, int sel) -{ - - if (sel >= p_menu->n_entries) - sel = 0; - p_menu->cur_sel = sel; - if (p_menu->pp_msgs[p_menu->cur_sel][0] == ' ' || - p_menu->pp_msgs[p_menu->cur_sel][0] == '#' || - IS_SUBMENU(p_menu->pp_msgs[p_menu->cur_sel])) - p_menu->cur_sel = 0; -} - static void select_next(menu_t *p_menu, int dx, int dy) { int next; @@ -574,6 +562,18 @@ static void select_next(menu_t *p_menu, int dx, int dy) p_menu->cur_sel = 0; } +static void select_one(menu_t *p_menu, int sel) +{ + + if (sel >= p_menu->n_entries) + sel = 0; + p_menu->cur_sel = sel; + if (p_menu->pp_msgs[p_menu->cur_sel][0] == ' ' || + p_menu->pp_msgs[p_menu->cur_sel][0] == '#' || + IS_SUBMENU(p_menu->pp_msgs[p_menu->cur_sel])) + select_next(p_menu, 0, 1); +} + static int is_submenu_title(menu_t *p_menu, int n) { if (n+1 >= p_menu->n_entries)