diff options
-rw-r--r-- | apps/gui/quickscreen.c | 6 | ||||
-rw-r--r-- | apps/settings_list.c | 6 |
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) | |||
392 | int oldrepeat = global_settings.repeat_mode; | 392 | int oldrepeat = global_settings.repeat_mode; |
393 | 393 | ||
394 | qs.items[QUICKSCREEN_TOP] = | 394 | qs.items[QUICKSCREEN_TOP] = |
395 | get_setting(global_settings.qs_items[QUICKSCREEN_TOP], | 395 | get_setting(global_settings.qs_items[QUICKSCREEN_TOP], NULL); |
396 | find_setting(&global_settings.party_mode, NULL)); | ||
397 | qs.items[QUICKSCREEN_LEFT] = | 396 | qs.items[QUICKSCREEN_LEFT] = |
398 | get_setting(global_settings.qs_items[QUICKSCREEN_LEFT], | 397 | get_setting(global_settings.qs_items[QUICKSCREEN_LEFT], |
399 | find_setting(&global_settings.playlist_shuffle, NULL)); | 398 | find_setting(&global_settings.playlist_shuffle, NULL)); |
@@ -401,8 +400,7 @@ bool quick_screen_quick(int button_enter) | |||
401 | get_setting(global_settings.qs_items[QUICKSCREEN_RIGHT], | 400 | get_setting(global_settings.qs_items[QUICKSCREEN_RIGHT], |
402 | find_setting(&global_settings.repeat_mode, NULL)); | 401 | find_setting(&global_settings.repeat_mode, NULL)); |
403 | qs.items[QUICKSCREEN_BOTTOM] = | 402 | qs.items[QUICKSCREEN_BOTTOM] = |
404 | get_setting(global_settings.qs_items[QUICKSCREEN_BOTTOM], | 403 | get_setting(global_settings.qs_items[QUICKSCREEN_BOTTOM], NULL); |
405 | find_setting(&global_settings.dirfilter, NULL)); | ||
406 | 404 | ||
407 | qs.callback = NULL; | 405 | qs.callback = NULL; |
408 | if (gui_syncquickscreen_run(&qs, button_enter)) | 406 | 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) | |||
460 | } | 460 | } |
461 | static void qs_set_default(void* setting, void* defaultval) | 461 | static void qs_set_default(void* setting, void* defaultval) |
462 | { | 462 | { |
463 | if (defaultval == NULL) | ||
464 | *(int*)setting = -1; | ||
463 | find_setting(defaultval, (int*)setting); | 465 | find_setting(defaultval, (int*)setting); |
464 | } | 466 | } |
465 | #endif | 467 | #endif |
@@ -1728,7 +1730,7 @@ const struct settings_list settings[] = { | |||
1728 | #endif | 1730 | #endif |
1729 | #ifdef HAVE_QUICKSCREEN | 1731 | #ifdef HAVE_QUICKSCREEN |
1730 | CUSTOM_SETTING(0, qs_items[QUICKSCREEN_TOP], LANG_TOP_QS_ITEM, | 1732 | CUSTOM_SETTING(0, qs_items[QUICKSCREEN_TOP], LANG_TOP_QS_ITEM, |
1731 | &global_settings.dirfilter, "qs top", | 1733 | NULL, "qs top", |
1732 | qs_load_from_cfg, qs_write_to_cfg, | 1734 | qs_load_from_cfg, qs_write_to_cfg, |
1733 | qs_is_changed, qs_set_default), | 1735 | qs_is_changed, qs_set_default), |
1734 | CUSTOM_SETTING(0, qs_items[QUICKSCREEN_LEFT], LANG_LEFT_QS_ITEM, | 1736 | CUSTOM_SETTING(0, qs_items[QUICKSCREEN_LEFT], LANG_LEFT_QS_ITEM, |
@@ -1740,7 +1742,7 @@ const struct settings_list settings[] = { | |||
1740 | qs_load_from_cfg, qs_write_to_cfg, | 1742 | qs_load_from_cfg, qs_write_to_cfg, |
1741 | qs_is_changed, qs_set_default), | 1743 | qs_is_changed, qs_set_default), |
1742 | CUSTOM_SETTING(0, qs_items[QUICKSCREEN_BOTTOM], LANG_BOTTOM_QS_ITEM, | 1744 | CUSTOM_SETTING(0, qs_items[QUICKSCREEN_BOTTOM], LANG_BOTTOM_QS_ITEM, |
1743 | &global_settings.dirfilter, "qs bottom", | 1745 | NULL, "qs bottom", |
1744 | qs_load_from_cfg, qs_write_to_cfg, | 1746 | qs_load_from_cfg, qs_write_to_cfg, |
1745 | qs_is_changed, qs_set_default), | 1747 | qs_is_changed, qs_set_default), |
1746 | #endif | 1748 | #endif |