aboutsummaryrefslogtreecommitdiff
path: root/source/nds
diff options
context:
space:
mode:
Diffstat (limited to 'source/nds')
-rw-r--r--source/nds/gui.c16
1 files changed, 8 insertions, 8 deletions
diff --git a/source/nds/gui.c b/source/nds/gui.c
index b31acee..0df85e1 100644
--- a/source/nds/gui.c
+++ b/source/nds/gui.c
@@ -3970,14 +3970,7 @@ u32 menu(u16 *screen, bool8 FirstInvocation)
current_option_num = next_option_num;
current_option = current_menu->options + current_option_num;
- if(current_option->option_type & ACTION_TYPE)
- current_option->action_function();
- else if(current_menu->key_function)
- {
- gui_action = CURSOR_RIGHT;
- current_menu->key_function();
- }
- else if(current_option->option_type & (NUMBER_SELECTION_TYPE | STRING_SELECTION_TYPE))
+ if(current_option->option_type & (NUMBER_SELECTION_TYPE | STRING_SELECTION_TYPE))
{
gui_action = CURSOR_RIGHT;
u32 current_option_val = *(current_option->current_option);
@@ -3991,6 +3984,13 @@ u32 menu(u16 *screen, bool8 FirstInvocation)
if(current_option->action_function)
current_option->action_function();
}
+ else if(current_option->option_type & ACTION_TYPE)
+ current_option->action_function();
+ else if(current_menu->key_function)
+ {
+ gui_action = CURSOR_RIGHT;
+ current_menu->key_function();
+ }
else if(current_option->option_type & SUBMENU_TYPE)
choose_menu(current_option->sub_menu);
}