From 40ce466f4dd6356d8a42a0cc20ea13c5833a41d3 Mon Sep 17 00:00:00 2001 From: Lain Date: Thu, 25 May 2023 18:09:46 -0700 Subject: [PATCH] deps/media-playback: Check `is_active` when frame preloading Adds a check to make sure that delayed preload is ignored if the stinger is restarted/interrupted. Just adds this check to the previous commit to make sure that it doesn't redundantly try to preload a frame when playback is restarted. --- deps/media-playback/media-playback/media.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/deps/media-playback/media-playback/media.c b/deps/media-playback/media-playback/media.c index c354317cf..431f49f7a 100644 --- a/deps/media-playback/media-playback/media.c +++ b/deps/media-playback/media-playback/media.c @@ -850,7 +850,7 @@ static inline bool mp_media_thread(mp_media_t *m) /* see note in mp_media_prepare_frames() for context on the * pointer check */ - if (preload_frame && m->obsframe.data[0]) { + if (preload_frame && m->obsframe.data[0] && !is_active) { m->v_preload_cb(m->opaque, &m->obsframe); }