Merge pull request #559 from tufang14/2.0release

srs reusable thread need join
ossrs · Jan 9, 2016 · da722b5 · da722b5
2 parents dbdd2f2 + 56bffb6
commit da722b5
Showing 1 changed file with 0 additions and 5 deletions.
diff --git a/trunk/src/app/srs_app_thread.cpp b/trunk/src/app/srs_app_thread.cpp
@@ -232,11 +232,6 @@ namespace internal {
         // readly terminated now.
         really_terminated = true;
 
-        // when thread terminated normally, also disposed.
-        // we must set to disposed before the on_thread_stop, which may free the thread.
-        // @see https://github.com/ossrs/srs/issues/546
-        disposed = true;
-
         handler->on_thread_stop();
         srs_info("thread %s cycle finished", _name);
     }