devs/foxbox
1
0
Fork 0
forked from len0rd/rockbox
Code Pull requests Activity

revert part of r19705 which caused fS#9773

Browse source 
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@19732 a1c6a512-1295-4272-9138-f99709370657
This commit is contained in:
Jonathan Gordon 2009-01-09 04:46:28 +00:00
parent 222080e0ee
commit 04dcf117a1
3 changed files with 9 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

4
apps/gui/gwps.c
View file

@ -687,6 +687,10 @@ long gui_wps_show(void)
} }
if (exit) { if (exit) {
if (wps_state.id3)
strcpy(wps_state.current_track_path, wps_state.id3->path);
else
wps_state.current_track_path[0] = '\0';
#ifdef HAVE_LCD_CHARCELLS #ifdef HAVE_LCD_CHARCELLS
status_set_record(false); status_set_record(false);
status_set_audio(false); status_set_audio(false);

3
apps/gui/gwps.h
View file

@ -469,6 +469,9 @@ struct wps_state
bool wps_time_countup; bool wps_time_countup;
struct mp3entry* id3; struct mp3entry* id3;
struct mp3entry* nid3; struct mp3entry* nid3;
char current_track_path[MAX_PATH]; /* used by root_menu.c to browse to the
current track at the time the audio is
stopped (so *id3 is invalid) */
}; };

4
apps/root_menu.c
View file

@ -96,9 +96,9 @@ static int browser(void* param)
filter = global_settings.dirfilter; filter = global_settings.dirfilter;
if (global_settings.browse_current && if (global_settings.browse_current &&
last_screen == GO_TO_WPS && last_screen == GO_TO_WPS &&
wps_state.id3) wps_state.current_track_path[0])
{ {
strcpy(folder, wps_state.id3->path); strcpy(folder, wps_state.current_track_path);
} }
#ifdef HAVE_HOTSWAP /* quick hack to stop crashing if you try entering #ifdef HAVE_HOTSWAP /* quick hack to stop crashing if you try entering
the browser from the menu when you were in the card the browser from the menu when you were in the card