forked from len0rd/rockbox
The return code from wps_display() wasn't handled correctly. And keylock() didn't reset the locked icon when reaching the end of the playlist. This fixes bug #624938.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@2753 a1c6a512-1295-4272-9138-f99709370657
This commit is contained in:
parent
c41322c591
commit
a12eb3d892
1 changed files with 23 additions and 9 deletions
32
apps/wps.c
32
apps/wps.c
|
|
@ -384,8 +384,7 @@ static bool ffwd_rew(int button)
|
|||
status_set_playmode(STATUS_PLAY);
|
||||
}
|
||||
#ifdef HAVE_LCD_CHARCELLS
|
||||
if (wps_display(id3))
|
||||
return true;
|
||||
wps_display(id3);
|
||||
#endif
|
||||
exit = true;
|
||||
break;
|
||||
|
|
@ -453,8 +452,13 @@ static bool keylock(void)
|
|||
display_keylock_text(true);
|
||||
keys_locked = true;
|
||||
wps_refresh(id3,0,true);
|
||||
if (wps_display(id3))
|
||||
return true;
|
||||
if (wps_display(id3)) {
|
||||
keys_locked = false;
|
||||
#ifdef HAVE_LCD_CHARCELLS
|
||||
status_set_record(false);
|
||||
#endif
|
||||
return false;
|
||||
}
|
||||
status_draw();
|
||||
while (button_get(false)); /* clear button queue */
|
||||
|
||||
|
|
@ -482,7 +486,13 @@ static bool keylock(void)
|
|||
return true;
|
||||
|
||||
case BUTTON_NONE:
|
||||
update();
|
||||
if(update()) {
|
||||
keys_locked = false;
|
||||
#ifdef HAVE_LCD_CHARCELLS
|
||||
status_set_record(false);
|
||||
#endif
|
||||
exit = true;
|
||||
}
|
||||
break;
|
||||
|
||||
#ifdef HAVE_RECORDER_KEYPAD
|
||||
|
|
@ -500,8 +510,13 @@ static bool keylock(void)
|
|||
display_keylock_text(true);
|
||||
while (button_get(false)); /* clear button queue */
|
||||
wps_refresh(id3,0,true);
|
||||
if(wps_display(id3))
|
||||
return true;
|
||||
if (wps_display(id3)) {
|
||||
keys_locked = false;
|
||||
#ifdef HAVE_LCD_CHARCELLS
|
||||
status_set_record(false);
|
||||
#endif
|
||||
exit = true;
|
||||
}
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
|
@ -610,8 +625,7 @@ static bool menu(void)
|
|||
status_set_param(false);
|
||||
#endif
|
||||
|
||||
if (wps_display(id3))
|
||||
return true;
|
||||
wps_display(id3);
|
||||
wps_refresh(id3,0,true);
|
||||
return false;
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue