diff options
| author | Arnaud Vrac <avrac@freebox.fr> | 2015-07-16 22:57:36 +0200 |
|---|---|---|
| committer | Sebastian Dröge <sebastian@centricular.com> | 2015-08-19 16:22:44 +0300 |
| commit | a4cb03235579a1ca555340e9d288485561524c54 (patch) | |
| tree | 4a86dba4d0f13ea80cbe9087fc9b030efc5a1865 | |
| parent | ea27fe3032639502e8467e2a7b9740695706cdee (diff) | |
| download | gstreamer-plugins-bad-a4cb03235579a1ca555340e9d288485561524c54.tar.gz | |
hlsdemux: abort playlist update when cancelled
Otherwise the download thread will get stuck, since the downloader is
disabled.
| -rw-r--r-- | ext/hls/gsthlsdemux.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/ext/hls/gsthlsdemux.c b/ext/hls/gsthlsdemux.c index 0f649b2c6..eb238e1b2 100644 --- a/ext/hls/gsthlsdemux.c +++ b/ext/hls/gsthlsdemux.c @@ -858,7 +858,7 @@ retry: TRUE, TRUE, TRUE, err); g_free (main_uri); if (download == NULL) { - if (update && !main_checked + if (!adaptive_demux->cancelled && update && !main_checked && gst_m3u8_client_has_variant_playlist (demux->client) && gst_m3u8_client_has_main (demux->client)) { GError *err2 = NULL; |