1 files changed, 13 insertions, 0 deletions

diff --git a/apps/plugins/mpegplayer/pcm_output.c b/apps/plugins/mpegplayer/pcm_output.c
index 281f7ddb72..ac89308af1 100644
--- a/apps/plugins/mpegplayer/pcm_output.c
+++ b/apps/plugins/mpegplayer/pcm_output.c
@@ -152,12 +152,25 @@ void pcm_output_add_data(void)
 /* Flushes the buffer - clock keeps counting */
 void pcm_output_flush(void)
 {
+    bool playing, paused;
+
     rb->pcm_play_lock();
 
+    playing = rb->pcm_is_playing();
+    paused = rb->pcm_is_paused();
+
+    /* Stop PCM to clear current buffer */
+    if (playing)
+        rb->pcm_play_stop();
+
     pcmbuf_threshold = PCMOUT_PLAY_WM;
     pcmbuf_read = pcmbuf_written = 0;
     pcmbuf_head = pcmbuf_tail = pcm_buffer;
 
+    /* Restart if playing state was current */
+    if (playing && !paused)
+        rb->pcm_play_data(get_more, NULL, 0);
+
     rb->pcm_play_unlock();
 }