diff options
-rw-r--r-- | apps/wps.c | 6 | ||||
-rw-r--r-- | firmware/mpeg.c | 2 |
2 files changed, 7 insertions, 1 deletions
diff --git a/apps/wps.c b/apps/wps.c index 1904387759..b0b3976e21 100644 --- a/apps/wps.c +++ b/apps/wps.c | |||
@@ -739,6 +739,12 @@ int wps_show(void) | |||
739 | restore = true; | 739 | restore = true; |
740 | } | 740 | } |
741 | 741 | ||
742 | if (mpeg_status() & MPEG_STATUS_PAUSE) { | ||
743 | paused = true; | ||
744 | } else { | ||
745 | paused = false; | ||
746 | } | ||
747 | |||
742 | while ( 1 ) | 748 | while ( 1 ) |
743 | { | 749 | { |
744 | 750 | ||
diff --git a/firmware/mpeg.c b/firmware/mpeg.c index 9528ede0ec..e1312c7399 100644 --- a/firmware/mpeg.c +++ b/firmware/mpeg.c | |||
@@ -1300,6 +1300,7 @@ static void mpeg_thread(void) | |||
1300 | /* Stop the current stream */ | 1300 | /* Stop the current stream */ |
1301 | play_pending = false; | 1301 | play_pending = false; |
1302 | playing = false; | 1302 | playing = false; |
1303 | paused = false; | ||
1303 | stop_dma(); | 1304 | stop_dma(); |
1304 | 1305 | ||
1305 | reset_mp3_buffer(); | 1306 | reset_mp3_buffer(); |
@@ -1339,7 +1340,6 @@ static void mpeg_thread(void) | |||
1339 | /* Tell the file loading code that we want to start playing | 1340 | /* Tell the file loading code that we want to start playing |
1340 | as soon as we have some data */ | 1341 | as soon as we have some data */ |
1341 | play_pending = true; | 1342 | play_pending = true; |
1342 | paused = false; | ||
1343 | 1343 | ||
1344 | update_playlist(); | 1344 | update_playlist(); |
1345 | current_track_counter++; | 1345 | current_track_counter++; |