diff options
author | Magnus Holmgren <magnushol@gmail.com> | 2007-08-22 16:33:34 +0000 |
---|---|---|
committer | Magnus Holmgren <magnushol@gmail.com> | 2007-08-22 16:33:34 +0000 |
commit | a50c2b149497c3213e0d52c5572a70008de13cb6 (patch) | |
tree | fe77f778dcd3f60bef66f670025ad873ce540c59 /apps/gui | |
parent | 9295e0a489101f040ea1dcafb35ca89e97a37315 (diff) | |
download | rockbox-a50c2b149497c3213e0d52c5572a70008de13cb6.tar.gz rockbox-a50c2b149497c3213e0d52c5572a70008de13cb6.zip |
Apply fix from FS#6341, with some changes by me.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@14430 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'apps/gui')
-rw-r--r-- | apps/gui/gwps.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/apps/gui/gwps.c b/apps/gui/gwps.c index 3defead099..1e5720e154 100644 --- a/apps/gui/gwps.c +++ b/apps/gui/gwps.c | |||
@@ -98,6 +98,7 @@ long gui_wps_show(void) | |||
98 | bool restore = false; | 98 | bool restore = false; |
99 | long restoretimer = 0; /* timer to delay screen redraw temporarily */ | 99 | long restoretimer = 0; /* timer to delay screen redraw temporarily */ |
100 | bool exit = false; | 100 | bool exit = false; |
101 | bool bookmark = false; | ||
101 | bool update_track = false; | 102 | bool update_track = false; |
102 | int i; | 103 | int i; |
103 | long last_left = 0, last_right = 0; | 104 | long last_left = 0, last_right = 0; |
@@ -585,6 +586,7 @@ long gui_wps_show(void) | |||
585 | case ACTION_WPS_STOP: | 586 | case ACTION_WPS_STOP: |
586 | if (global_settings.party_mode) | 587 | if (global_settings.party_mode) |
587 | break; | 588 | break; |
589 | bookmark = true; | ||
588 | exit = true; | 590 | exit = true; |
589 | break; | 591 | break; |
590 | 592 | ||
@@ -624,7 +626,6 @@ long gui_wps_show(void) | |||
624 | break; | 626 | break; |
625 | #endif | 627 | #endif |
626 | case SYS_POWEROFF: | 628 | case SYS_POWEROFF: |
627 | bookmark_autobookmark(); | ||
628 | #if LCD_DEPTH > 1 | 629 | #if LCD_DEPTH > 1 |
629 | show_main_backdrop(); | 630 | show_main_backdrop(); |
630 | #endif | 631 | #endif |
@@ -676,7 +677,8 @@ long gui_wps_show(void) | |||
676 | 677 | ||
677 | FOR_NB_SCREENS(i) | 678 | FOR_NB_SCREENS(i) |
678 | gui_wps[i].display->stop_scroll(); | 679 | gui_wps[i].display->stop_scroll(); |
679 | bookmark_autobookmark(); | 680 | if (bookmark) |
681 | bookmark_autobookmark(); | ||
680 | audio_stop(); | 682 | audio_stop(); |
681 | #ifdef AB_REPEAT_ENABLE | 683 | #ifdef AB_REPEAT_ENABLE |
682 | ab_reset_markers(); | 684 | ab_reset_markers(); |