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

the join maybe failed, should use a variable to ensure thread terminated. 1.0.28.

Browse source
This commit is contained in:
winlin 2015-02-17 21:01:44 +08:00
parent 9a7696a7c2
commit ccc30c70c4
3 changed files with 5 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

4
trunk/src/app/srs_app_thread.cpp
View file

@ -120,7 +120,9 @@ void SrsThread::stop()
st_thread_interrupt(tid);
// wait the thread to exit.
st_thread_join(tid, NULL);
int ret = st_thread_join(tid, NULL);
// TODO: FIXME: the join maybe failed, should use a variable to ensure thread terminated.
srs_assert(ret == 0);
tid = NULL;
}

2
trunk/src/core/srs_core.hpp
View file

@ -31,7 +31,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
// current release version
#define VERSION_MAJOR 1
#define VERSION_MINOR 0
#define VERSION_REVISION 27
#define VERSION_REVISION 28
// server info.
#define RTMP_SIG_SRS_KEY "SRS"