Skip to content

Don't go back to picture flow if wps select option isn't set accordingly #5

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Olsro wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Don't go back to picture flow if wps select option isn't set accordingly #5

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
37 changes: 21 additions & 16 deletions apps/gui/wps.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1049,28 +1049,33 @@ long gui_wps_show(void)
}
break;

/* iPod Classic 6G custom: open PictureFlow instead of stopping */
case ACTION_WPS_STOP:
{
theme_enabled = false;
gwps_leave_wps(false);
filetype_load_plugin("pictureflow", NULL);
if (!(audio_status() & AUDIO_STATUS_PLAY))
int sel_action = global_settings.wps_select_action;
if (sel_action == 2)
{
/* audio stopped in PictureFlow; return to WPS
via wpsscrn() which handles playlist resume */
gwps_leave_wps(true);
return GO_TO_WPS;
/* iPod Classic 6G custom: return to PictureFlow instead of stopping
if sel_action = 2 */
theme_enabled = false;
gwps_leave_wps(false);
filetype_load_plugin("pictureflow", NULL);
if (!(audio_status() & AUDIO_STATUS_PLAY))
{
/* audio stopped in PictureFlow; return to WPS
via wpsscrn() which handles playlist resume */
gwps_leave_wps(true);
return GO_TO_WPS;
}
restore = true;
}
else
{
/* In other cases, stop & exit */
bookmark = true;
exit = true;
}
restore = true;
}
break;
#if 0 /* original stop behavior */
case ACTION_WPS_STOP:
bookmark = true;
exit = true;
break;
#endif

case ACTION_WPS_LIST_BOOKMARKS:
gwps_leave_wps(true);
Expand Down