From 6d64e38656ba7df416d8f3035109865ee8e82d40 Mon Sep 17 00:00:00 2001
From: winlin <winlin@vip.126.com>
Date: Tue, 10 Mar 2015 14:35:20 +0800
Subject: [PATCH] warning when join thread failed. 1.0.29

---
 trunk/src/app/srs_app_thread.cpp | 4 +++-
 trunk/src/core/srs_core.hpp      | 2 +-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/trunk/src/app/srs_app_thread.cpp b/trunk/src/app/srs_app_thread.cpp
index 4785d6987..99fc70028 100644
--- a/trunk/src/app/srs_app_thread.cpp
+++ b/trunk/src/app/srs_app_thread.cpp
@@ -122,7 +122,9 @@ void SrsThread::stop()
         // wait the thread to exit.
         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);
+        if (ret != 0) {
+            srs_warn("join thread failed. code=%d", ret);
+        }
         
         tid = NULL;
     }
diff --git a/trunk/src/core/srs_core.hpp b/trunk/src/core/srs_core.hpp
index 89e2f8071..635781d20 100644
--- a/trunk/src/core/srs_core.hpp
+++ b/trunk/src/core/srs_core.hpp
@@ -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    28
+#define VERSION_REVISION    29
 
 // server info.
 #define RTMP_SIG_SRS_KEY "SRS"