3 files changed, 15 insertions, 1 deletions

diff --git a/src/media.c b/src/media.c
index 2ec2109d..180c28e6 100644
--- a/src/media.c
+++ b/src/media.c
@@ -469,6 +469,15 @@ iPlayer *audioPlayer_Media(const iMedia *d, iMediaId audioId) {
     return NULL;
 }
 
+void pauseAllPlayers_Media(const iMedia *d, iBool setPaused) {
+    for (size_t i = 0; i < size_PtrArray(&d->audio); ++i) {
+        const iGmAudio *audio = constAt_PtrArray(&d->audio, i);
+        if (audio->player) {
+            setPaused_Player(audio->player, setPaused);
+        }
+    }
+}
+
 iBool downloadInfo_Media(const iMedia *d, iMediaId downloadId, iGmMediaInfo *info_out) {
     if (downloadId > 0 && downloadId <= size_PtrArray(&d->downloads)) {
         const iGmDownload *dl = constAt_PtrArray(&d->downloads, downloadId - 1);
diff --git a/src/media.h b/src/media.h
index c6973b79..f7ad6efd 100644
--- a/src/media.h
+++ b/src/media.h
@@ -61,6 +61,7 @@ size_t          numAudio_Media      (const iMedia *);
 iMediaId        findLinkAudio_Media (const iMedia *, uint16_t linkId);
 iBool           audioInfo_Media     (const iMedia *, iMediaId audioId, iGmMediaInfo *info_out);
 iPlayer *       audioPlayer_Media   (const iMedia *, iMediaId audioId);
+void            pauseAllPlayers_Media(const iMedia *, iBool setPaused);
 
 iMediaId        findLinkDownload_Media  (const iMedia *, uint16_t linkId);
 iBool           downloadInfo_Media      (const iMedia *, iMediaId downloadId, iGmMediaInfo *info_out);
diff --git a/src/ui/documentwidget.c b/src/ui/documentwidget.c
index 29e264e8..a3ac208a 100644
--- a/src/ui/documentwidget.c
+++ b/src/ui/documentwidget.c
@@ -392,6 +392,7 @@ void init_DocumentWidget(iDocumentWidget *d) {
 }
 
 void deinit_DocumentWidget(iDocumentWidget *d) {
+    pauseAllPlayers_Media(media_GmDocument(d->doc), iTrue);
     removeTicker_App(animate_DocumentWidget_, d);
     removeTicker_App(prerender_DocumentWidget_, d);
     remove_Periodic(periodic_App(), d);
@@ -1046,6 +1047,7 @@ void setSource_DocumentWidget(iDocumentWidget *d, const iString *source) {
 }
 
 static void replaceDocument_DocumentWidget_(iDocumentWidget *d, iGmDocument *newDoc) {
+    pauseAllPlayers_Media(media_GmDocument(d->doc), iTrue);
     iRelease(d->doc);
     d->doc = ref_Object(newDoc);
     documentWasChanged_DocumentWidget_(d);
@@ -1581,6 +1583,7 @@ static void updateFromCachedResponse_DocumentWidget_(iDocumentWidget *d, float n
     clear_ObjectList(d->media);
     delete_Gempub(d->sourceGempub);
     d->sourceGempub = NULL;
+    pauseAllPlayers_Media(media_GmDocument(d->doc), iTrue);
     iRelease(d->doc);
     destroy_Widget(d->footerButtons);
     d->footerButtons = NULL;
@@ -1867,6 +1870,7 @@ static void checkResponse_DocumentWidget_(iDocumentWidget *d) {
                     /* Keep scroll position when reloading the same page. */
                     reset_SmoothScroll(&d->scrollY);
                 }
+                pauseAllPlayers_Media(media_GmDocument(d->doc), iTrue);
                 iRelease(d->doc); /* new content incoming */
                 d->doc = new_GmDocument();
                 delete_Gempub(d->sourceGempub);
@@ -4673,7 +4677,7 @@ void setUrlAndSource_DocumentWidget(iDocumentWidget *d, const iString *url, cons
     initCurrent_Time(&resp->when);
     set_String(&resp->meta, mime);
     set_Block(&resp->body, source);
-    updateFromCachedResponse_DocumentWidget_(d, 0, resp);
+    updateFromCachedResponse_DocumentWidget_(d, 0, resp, NULL);
     delete_GmResponse(resp);
 }