From 74c78c1f131de85ccdfdfbc39b7975736be73349 Mon Sep 17 00:00:00 2001 From: jp9000 Date: Thu, 4 Feb 2016 10:58:26 -0800 Subject: [PATCH] obs-ffmpeg: Fix media source starting even if not active If the media source is set to restart on activation, it also shuts down when not active. However, it would *always* start regardless of active/inactive when the source is first created. It shouldn't do that, it should start up only when it becomes active. --- plugins/obs-ffmpeg/obs-ffmpeg-source.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/plugins/obs-ffmpeg/obs-ffmpeg-source.c b/plugins/obs-ffmpeg/obs-ffmpeg-source.c index b0468d3cd..9a728c183 100644 --- a/plugins/obs-ffmpeg/obs-ffmpeg-source.c +++ b/plugins/obs-ffmpeg/obs-ffmpeg-source.c @@ -578,7 +578,8 @@ static void ffmpeg_source_update(void *data, obs_data_t *settings) } dump_source_info(s, input, input_format, is_advanced); - ffmpeg_source_start(s); + if (!s->restart_on_activate || obs_source_active(s->source)) + ffmpeg_source_start(s); } static const char *ffmpeg_source_getname(void *unused)