Merge pull request #330 from xubin11235/2.0release

修复forward崩溃
ossrs · Sep 2, 2016 · 958e20a · 958e20a
2 parents 6696782 + 49853d2
commit 958e20a
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 2 deletions.
diff --git a/trunk/src/app/srs_app_forward.cpp b/trunk/src/app/srs_app_forward.cpp
@@ -68,8 +68,6 @@ SrsForwarder::SrsForwarder(SrsSource* _source)
 
 SrsForwarder::~SrsForwarder()
 {
-    on_unpublish();
-
     srs_freep(pthread);
     srs_freep(queue);
     srs_freep(jitter);

diff --git a/trunk/src/app/srs_app_st.cpp b/trunk/src/app/srs_app_st.cpp
@@ -237,6 +237,7 @@ void srs_close_stfd(st_netfd_t& stfd)
         // we must ensure the close is ok.
         int err = st_netfd_close(stfd);
         srs_assert(err != -1);
+        stfd = NULL;
     }
 }