From 1d2e8f790be54e826f9d479b730ae7e5ffbcadd0 Mon Sep 17 00:00:00 2001 From: Thulinma Date: Wed, 28 Sep 2016 16:00:35 +0200 Subject: [PATCH] Stop limits and triggers from occurring when filename is being overridden in startInput calls --- lib/stream.cpp | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/lib/stream.cpp b/lib/stream.cpp index 7d0f3362..53794672 100644 --- a/lib/stream.cpp +++ b/lib/stream.cpp @@ -178,16 +178,18 @@ bool Util::startInput(std::string streamname, std::string filename, bool forkFir DEBUG_MSG(DLVL_HIGH, "Stream %s not configured - attempting to ignore", streamname.c_str()); } /*LTS-START*/ - if (stream_cfg && stream_cfg.getMember("hardlimit_active")) { - return false; - } - if(Triggers::shouldTrigger("STREAM_LOAD", smp)){ - if (!Triggers::doTrigger("STREAM_LOAD", streamname, smp)){ + if (!filename.size()){ + if (stream_cfg && stream_cfg.getMember("hardlimit_active")) { return false; } - } - if(Triggers::shouldTrigger("STREAM_SOURCE", smp)){ - Triggers::doTrigger("STREAM_SOURCE", streamname, smp, false, filename); + if(Triggers::shouldTrigger("STREAM_LOAD", smp)){ + if (!Triggers::doTrigger("STREAM_LOAD", streamname, smp)){ + return false; + } + } + if(Triggers::shouldTrigger("STREAM_SOURCE", smp)){ + Triggers::doTrigger("STREAM_SOURCE", streamname, smp, false, filename); + } } /*LTS-END*/