summaryrefslogtreecommitdiff
path: root/apps
diff options
context:
space:
mode:
authorLinus Nielsen Feltzing <linus@haxx.se>2008-01-09 14:26:19 +0000
committerLinus Nielsen Feltzing <linus@haxx.se>2008-01-09 14:26:19 +0000
commit741f5b24b37b8f3f8e89f3b21bcc071f05dcc701 (patch)
tree101517d62f10539eb185b7110609be5d5a9a4d6d /apps
parente953bcb2d47a593a49ce536856dea0d55937cb4e (diff)
downloadrockbox-741f5b24b37b8f3f8e89f3b21bcc071f05dcc701.tar.gz
rockbox-741f5b24b37b8f3f8e89f3b21bcc071f05dcc701.zip
Prevent idle poweroff in the MPEG player plugin. Also save the settings when receiving SYS_POWEROFF and SYS_USB_CONNECTED. Fixes FS#8439 and FS#8388.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@16033 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'apps')
-rw-r--r--apps/plugins/mpegplayer/mpegplayer.c5
1 files changed, 5 insertions, 0 deletions
diff --git a/apps/plugins/mpegplayer/mpegplayer.c b/apps/plugins/mpegplayer/mpegplayer.c
index b228a88dda..b547d36f6a 100644
--- a/apps/plugins/mpegplayer/mpegplayer.c
+++ b/apps/plugins/mpegplayer/mpegplayer.c
@@ -1231,6 +1231,10 @@ static void button_loop(void)
1231 { 1231 {
1232 int button = rb->button_get_w_tmo(WVS_MIN_UPDATE_INTERVAL); 1232 int button = rb->button_get_w_tmo(WVS_MIN_UPDATE_INTERVAL);
1233 1233
1234 /* Make sure Rockbox doesn't turn off the player because of
1235 too little activity */
1236 rb->reset_poweroff_timer();
1237
1234 switch (button) 1238 switch (button)
1235 { 1239 {
1236 case BUTTON_NONE: 1240 case BUTTON_NONE:
@@ -1337,6 +1341,7 @@ static void button_loop(void)
1337 /* Stop and get the resume time before closing the file early */ 1341 /* Stop and get the resume time before closing the file early */
1338 wvs_stop(); 1342 wvs_stop();
1339 stream_close(); 1343 stream_close();
1344 save_settings(); /* Save settings (if they have changed) */
1340 /* Fall-through */ 1345 /* Fall-through */
1341 default: 1346 default:
1342 rb->default_event_handler(button); 1347 rb->default_event_handler(button);