external/srs
1
0
Fork 0
mirror of https://github.com/ossrs/srs.git synced 2025-03-09 15:49:59 +00:00
Code Issues Releases Wiki Activity

Merge branch '2.0release' into develop

Browse source
This commit is contained in:
winlin 2016-09-05 14:56:41 +08:00
commit b24d1de377
1 changed files with 12 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

14
trunk/src/app/srs_app_source.cpp
View file

@ -1038,7 +1038,18 @@ int SrsSource::cycle()
bool SrsSource::expired() bool SrsSource::expired()
{ {
if (!consumers.empty() || die_at == -1) { // unknown state?
if (die_at == -1) {
return false;
}
// still publishing?
if (!_can_publish) {
return false;
}
// has any consumers?
if (!consumers.empty()) {
return false; return false;
} }
@ -2226,7 +2237,6 @@ int SrsSource::create_consumer(SrsConnection* conn, SrsConsumer*& consumer, bool
{ {
int ret = ERROR_SUCCESS; int ret = ERROR_SUCCESS;
die_at = -1;
consumer = new SrsConsumer(this, conn); consumer = new SrsConsumer(this, conn);
consumers.push_back(consumer); consumers.push_back(consumer);