diff options
author | Linus Nielsen Feltzing <linus@haxx.se> | 2002-10-27 23:38:24 +0000 |
---|---|---|
committer | Linus Nielsen Feltzing <linus@haxx.se> | 2002-10-27 23:38:24 +0000 |
commit | a12eb3d89239c2933bd3679cffd7d82be305dd42 (patch) | |
tree | caecb65ffbad65fc39dfffeca61f720d41dddc77 /apps/wps.c | |
parent | c41322c59182e4cb10de185f7c14a59a015ac994 (diff) | |
download | rockbox-a12eb3d89239c2933bd3679cffd7d82be305dd42.tar.gz rockbox-a12eb3d89239c2933bd3679cffd7d82be305dd42.zip |
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
Diffstat (limited to 'apps/wps.c')
-rw-r--r-- | apps/wps.c | 32 |
1 files changed, 23 insertions, 9 deletions
diff --git a/apps/wps.c b/apps/wps.c index f0ba54f3a3..dd3649e838 100644 --- a/apps/wps.c +++ b/apps/wps.c | |||
@@ -384,8 +384,7 @@ static bool ffwd_rew(int button) | |||
384 | status_set_playmode(STATUS_PLAY); | 384 | status_set_playmode(STATUS_PLAY); |
385 | } | 385 | } |
386 | #ifdef HAVE_LCD_CHARCELLS | 386 | #ifdef HAVE_LCD_CHARCELLS |
387 | if (wps_display(id3)) | 387 | wps_display(id3); |
388 | return true; | ||
389 | #endif | 388 | #endif |
390 | exit = true; | 389 | exit = true; |
391 | break; | 390 | break; |
@@ -453,8 +452,13 @@ static bool keylock(void) | |||
453 | display_keylock_text(true); | 452 | display_keylock_text(true); |
454 | keys_locked = true; | 453 | keys_locked = true; |
455 | wps_refresh(id3,0,true); | 454 | wps_refresh(id3,0,true); |
456 | if (wps_display(id3)) | 455 | if (wps_display(id3)) { |
457 | return true; | 456 | keys_locked = false; |
457 | #ifdef HAVE_LCD_CHARCELLS | ||
458 | status_set_record(false); | ||
459 | #endif | ||
460 | return false; | ||
461 | } | ||
458 | status_draw(); | 462 | status_draw(); |
459 | while (button_get(false)); /* clear button queue */ | 463 | while (button_get(false)); /* clear button queue */ |
460 | 464 | ||
@@ -482,7 +486,13 @@ static bool keylock(void) | |||
482 | return true; | 486 | return true; |
483 | 487 | ||
484 | case BUTTON_NONE: | 488 | case BUTTON_NONE: |
485 | update(); | 489 | if(update()) { |
490 | keys_locked = false; | ||
491 | #ifdef HAVE_LCD_CHARCELLS | ||
492 | status_set_record(false); | ||
493 | #endif | ||
494 | exit = true; | ||
495 | } | ||
486 | break; | 496 | break; |
487 | 497 | ||
488 | #ifdef HAVE_RECORDER_KEYPAD | 498 | #ifdef HAVE_RECORDER_KEYPAD |
@@ -500,8 +510,13 @@ static bool keylock(void) | |||
500 | display_keylock_text(true); | 510 | display_keylock_text(true); |
501 | while (button_get(false)); /* clear button queue */ | 511 | while (button_get(false)); /* clear button queue */ |
502 | wps_refresh(id3,0,true); | 512 | wps_refresh(id3,0,true); |
503 | if(wps_display(id3)) | 513 | if (wps_display(id3)) { |
504 | return true; | 514 | keys_locked = false; |
515 | #ifdef HAVE_LCD_CHARCELLS | ||
516 | status_set_record(false); | ||
517 | #endif | ||
518 | exit = true; | ||
519 | } | ||
505 | break; | 520 | break; |
506 | } | 521 | } |
507 | } | 522 | } |
@@ -610,8 +625,7 @@ static bool menu(void) | |||
610 | status_set_param(false); | 625 | status_set_param(false); |
611 | #endif | 626 | #endif |
612 | 627 | ||
613 | if (wps_display(id3)) | 628 | wps_display(id3); |
614 | return true; | ||
615 | wps_refresh(id3,0,true); | 629 | wps_refresh(id3,0,true); |
616 | return false; | 630 | return false; |
617 | } | 631 | } |