From bc61b1de1889954a41508a9d606ecbe95eaaeeda Mon Sep 17 00:00:00 2001 From: winlin Date: Thu, 10 Apr 2014 11:47:38 +0800 Subject: [PATCH] fix bug of reload ingest --- trunk/src/app/srs_app_config.cpp | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/trunk/src/app/srs_app_config.cpp b/trunk/src/app/srs_app_config.cpp index e9262abca..04f28c0b5 100644 --- a/trunk/src/app/srs_app_config.cpp +++ b/trunk/src/app/srs_app_config.cpp @@ -843,7 +843,11 @@ int SrsConfig::reload_ingest(SrsConfDirective* new_vhost, SrsConfDirective* old_ SrsConfDirective* new_ingester = new_ingesters.at(i); std::string ingest_id = new_ingester->arg0(); SrsConfDirective* old_ingester = old_vhost->get("ingest", ingest_id); - srs_assert(old_ingester); + + // ignore the added ingester. + if (!old_ingester) { + continue; + } if (srs_directive_equals(new_ingester, old_ingester)) { continue;