diff options
-rw-r--r-- | apps/playlist_viewer.c | 18 | ||||
-rw-r--r-- | apps/tree.c | 12 |
2 files changed, 24 insertions, 6 deletions
diff --git a/apps/playlist_viewer.c b/apps/playlist_viewer.c index 318bdcd915..e0e2e787cd 100644 --- a/apps/playlist_viewer.c +++ b/apps/playlist_viewer.c | |||
@@ -853,6 +853,24 @@ enum playlist_viewer_result playlist_viewer_ex(const char* filename) | |||
853 | case ACTION_STD_MENU: | 853 | case ACTION_STD_MENU: |
854 | ret = PLAYLIST_VIEWER_MAINMENU; | 854 | ret = PLAYLIST_VIEWER_MAINMENU; |
855 | goto exit; | 855 | goto exit; |
856 | #ifdef HAVE_QUICKSCREEN | ||
857 | case ACTION_STD_QUICKSCREEN: | ||
858 | if (!global_settings.shortcuts_replaces_qs) | ||
859 | { | ||
860 | quick_screen_quick(button); | ||
861 | update_playlist(true); | ||
862 | gui_synclist_set_voice_callback(&playlist_lists, | ||
863 | global_settings.talk_file? | ||
864 | &playlist_callback_voice:NULL); | ||
865 | gui_synclist_set_icon_callback(&playlist_lists, | ||
866 | global_settings.playlist_viewer_icons? | ||
867 | &playlist_callback_icons:NULL); | ||
868 | gui_synclist_set_title(&playlist_lists, str(LANG_PLAYLIST), Icon_Playlist); | ||
869 | gui_synclist_draw(&playlist_lists); | ||
870 | gui_synclist_speak_item(&playlist_lists); | ||
871 | break; | ||
872 | } | ||
873 | #endif | ||
856 | default: | 874 | default: |
857 | if(default_event_handler(button) == SYS_USB_CONNECTED) | 875 | if(default_event_handler(button) == SYS_USB_CONNECTED) |
858 | { | 876 | { |
diff --git a/apps/tree.c b/apps/tree.c index 44af918804..9e4aafccfe 100644 --- a/apps/tree.c +++ b/apps/tree.c | |||
@@ -735,18 +735,18 @@ static int dirbrowse(void) | |||
735 | break; | 735 | break; |
736 | #ifdef HAVE_QUICKSCREEN | 736 | #ifdef HAVE_QUICKSCREEN |
737 | case ACTION_STD_QUICKSCREEN: | 737 | case ACTION_STD_QUICKSCREEN: |
738 | /* don't enter f2 from plugin browser */ | 738 | if (global_settings.shortcuts_replaces_qs) |
739 | if (*tc.dirfilter < NUM_FILTER_MODES) | ||
740 | { | 739 | { |
741 | if (global_settings.shortcuts_replaces_qs) | 740 | if (*tc.dirfilter < NUM_FILTER_MODES) |
742 | { | 741 | { |
743 | global_status.last_screen = GO_TO_SHORTCUTMENU; | 742 | global_status.last_screen = GO_TO_SHORTCUTMENU; |
744 | return quick_screen_quick(button); | 743 | return quick_screen_quick(button); |
745 | } | 744 | } |
746 | else if (quick_screen_quick(button)) | 745 | break; |
747 | reload_dir = true; | ||
748 | restore = true; | ||
749 | } | 746 | } |
747 | else if (quick_screen_quick(button)) | ||
748 | reload_dir = true; | ||
749 | restore = true; | ||
750 | break; | 750 | break; |
751 | #endif | 751 | #endif |
752 | 752 | ||