summaryrefslogtreecommitdiffstats
path: root/apps
diff options
context:
space:
mode:
authorJonathan Gordon <rockbox@jdgordon.info>2011-07-20 01:30:29 +0000
committerJonathan Gordon <rockbox@jdgordon.info>2011-07-20 01:30:29 +0000
commit4983d052a0d73340d09086a796b4ccbb45dfd88b (patch)
treed330148fe013061dd86f98bfec09cc4ff3f46e98 /apps
parentded03f43f2247f90a3919a8d1fe5e5be17a9b7b2 (diff)
downloadrockbox-4983d052a0d73340d09086a796b4ccbb45dfd88b.tar.gz
rockbox-4983d052a0d73340d09086a796b4ccbb45dfd88b.zip
Remove to top/bottom quickscreen defaults.
As constantly discussed in IRC, it is insane that dirfilter and party mode are defaults on the quickscreen, both have caused countless problems for users accidentaly enabling them. This wont change anything for users who have changed their setting, only for people who left it default git-svn-id: svn://svn.rockbox.org/rockbox/trunk@30176 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'apps')
-rw-r--r--apps/gui/quickscreen.c6
-rw-r--r--apps/settings_list.c6
2 files changed, 6 insertions, 6 deletions
diff --git a/apps/gui/quickscreen.c b/apps/gui/quickscreen.c
index 3922c94c4b..e97d82196d 100644
--- a/apps/gui/quickscreen.c
+++ b/apps/gui/quickscreen.c
@@ -392,8 +392,7 @@ bool quick_screen_quick(int button_enter)
int oldrepeat = global_settings.repeat_mode;
qs.items[QUICKSCREEN_TOP] =
- get_setting(global_settings.qs_items[QUICKSCREEN_TOP],
- find_setting(&global_settings.party_mode, NULL));
+ get_setting(global_settings.qs_items[QUICKSCREEN_TOP], NULL);
qs.items[QUICKSCREEN_LEFT] =
get_setting(global_settings.qs_items[QUICKSCREEN_LEFT],
find_setting(&global_settings.playlist_shuffle, NULL));
@@ -401,8 +400,7 @@ bool quick_screen_quick(int button_enter)
get_setting(global_settings.qs_items[QUICKSCREEN_RIGHT],
find_setting(&global_settings.repeat_mode, NULL));
qs.items[QUICKSCREEN_BOTTOM] =
- get_setting(global_settings.qs_items[QUICKSCREEN_BOTTOM],
- find_setting(&global_settings.dirfilter, NULL));
+ get_setting(global_settings.qs_items[QUICKSCREEN_BOTTOM], NULL);
qs.callback = NULL;
if (gui_syncquickscreen_run(&qs, button_enter))
diff --git a/apps/settings_list.c b/apps/settings_list.c
index dcdeaecd53..292749beaf 100644
--- a/apps/settings_list.c
+++ b/apps/settings_list.c
@@ -460,6 +460,8 @@ static bool qs_is_changed(void* setting, void* defaultval)
}
static void qs_set_default(void* setting, void* defaultval)
{
+ if (defaultval == NULL)
+ *(int*)setting = -1;
find_setting(defaultval, (int*)setting);
}
#endif
@@ -1728,7 +1730,7 @@ const struct settings_list settings[] = {
#endif
#ifdef HAVE_QUICKSCREEN
CUSTOM_SETTING(0, qs_items[QUICKSCREEN_TOP], LANG_TOP_QS_ITEM,
- &global_settings.dirfilter, "qs top",
+ NULL, "qs top",
qs_load_from_cfg, qs_write_to_cfg,
qs_is_changed, qs_set_default),
CUSTOM_SETTING(0, qs_items[QUICKSCREEN_LEFT], LANG_LEFT_QS_ITEM,
@@ -1740,7 +1742,7 @@ const struct settings_list settings[] = {
qs_load_from_cfg, qs_write_to_cfg,
qs_is_changed, qs_set_default),
CUSTOM_SETTING(0, qs_items[QUICKSCREEN_BOTTOM], LANG_BOTTOM_QS_ITEM,
- &global_settings.dirfilter, "qs bottom",
+ NULL, "qs bottom",
qs_load_from_cfg, qs_write_to_cfg,
qs_is_changed, qs_set_default),
#endif