mirror of
https://github.com/ossrs/srs.git
synced 2025-03-09 15:49:59 +00:00
merge from 2.0
This commit is contained in:
commit
0a8d40925f
3 changed files with 6 additions and 4 deletions
2
trunk/src/app/srs_app_source.cpp
Normal file → Executable file
2
trunk/src/app/srs_app_source.cpp
Normal file → Executable file
|
@ -1044,7 +1044,7 @@ bool SrsSource::expired()
|
|||
}
|
||||
|
||||
// still publishing?
|
||||
if (!_can_publish) {
|
||||
if (!_can_publish || !publish_edge->can_publish()) {
|
||||
return false;
|
||||
}
|
||||
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue