summaryrefslogtreecommitdiffstats
path: root/apps
diff options
context:
space:
mode:
authorSteve Bavin <pondlife@pondlife.me>2009-03-10 07:27:13 +0000
committerSteve Bavin <pondlife@pondlife.me>2009-03-10 07:27:13 +0000
commitf14999e0b9b180abe0044d9184a5a6f7260e91fe (patch)
tree7d7d1bfad0743636d41b0504921442abc4f5b356 /apps
parent754ae4acba00648c5964723f6414f9b6a1f20c9b (diff)
downloadrockbox-f14999e0b9b180abe0044d9184a5a6f7260e91fe.tar.gz
rockbox-f14999e0b9b180abe0044d9184a5a6f7260e91fe.tar.bz2
rockbox-f14999e0b9b180abe0044d9184a5a6f7260e91fe.zip
Fix redraw sequence when exiting a setting menu, so splashes work properly - see FS#9994.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@20281 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'apps')
-rw-r--r--apps/menu.c17
-rw-r--r--apps/menu.h2
2 files changed, 3 insertions, 16 deletions
diff --git a/apps/menu.c b/apps/menu.c
index 4329c8206d..92d14aac6a 100644
--- a/apps/menu.c
+++ b/apps/menu.c
@@ -283,7 +283,7 @@ static int talk_menu_item(int selected_item, void *data)
return 0;
}
-bool do_setting_from_menu(const struct menu_item_ex *temp,
+void do_setting_from_menu(const struct menu_item_ex *temp,
struct viewport parent[NB_SCREENS])
{
int setting_id, oldval;
@@ -333,15 +333,6 @@ bool do_setting_from_menu(const struct menu_item_ex *temp,
option_screen((struct settings_list *)setting, parent,
setting->flags&F_TEMPVAR, title);
- if (var_type == F_T_INT || var_type == F_T_UINT)
- {
- return oldval != *(int*)setting->setting;
- }
- else if (var_type == F_T_BOOL)
- {
- return oldval != *(bool*)setting->setting;
- }
- return false;
}
/* display a menu */
@@ -619,11 +610,7 @@ int do_menu(const struct menu_item_ex *start_menu, int *start_selected,
case MT_SETTING:
case MT_SETTING_W_TEXT:
{
- if (do_setting_from_menu(temp, vps))
- {
- init_menu_lists(menu, &lists, selected, true,vps);
- redraw_lists = false; /* above does the redraw */
- }
+ do_setting_from_menu(temp, vps);
break;
}
case MT_RETURN_ID:
diff --git a/apps/menu.h b/apps/menu.h
index 6dec5e0bd3..b386b7ce4b 100644
--- a/apps/menu.h
+++ b/apps/menu.h
@@ -101,7 +101,7 @@ struct menu_item_ex {
typedef int (*menu_callback_type)(int action,
const struct menu_item_ex *this_item);
-bool do_setting_from_menu(const struct menu_item_ex *temp,
+void do_setting_from_menu(const struct menu_item_ex *temp,
struct viewport parent[NB_SCREENS]);
/*