Micro changes and refines.

trunk/src/app/srs_app_config.cpp

@@ -313,7 +313,7 @@ srs_error_t srs_config_transform_vhost(SrsConfDirective* root)
                 SrsConfDirective* conf = *it;
 
                 if (conf->name == "perf_stat" || conf->name == "queue_length") {
-                    dir->directives.erase(it);
+                    it = dir->directives.erase(it);
                     srs_freep(conf);
                     continue;
                 }
@@ -835,7 +835,7 @@ void SrsConfDirective::remove(SrsConfDirective* v)
 {
     std::vector<SrsConfDirective*>::iterator it;
     if ((it = std::find(directives.begin(), directives.end(), v)) != directives.end()) {
-        directives.erase(it);
+        it = directives.erase(it);
     }
 }
 
@@ -1242,7 +1242,7 @@ void SrsConfig::unsubscribe(ISrsReloadHandler* handler)
         return;
     }
     
-    subscribes.erase(it);
+    it = subscribes.erase(it);
 }
 
 // LCOV_EXCL_START

trunk/src/app/srs_app_server.cpp

@@ -325,6 +325,8 @@ SrsServer::SrsServer()
     signal_manager = new SrsSignalManager(this);
     conn_manager = new SrsResourceManager("TCP", true);
     latest_version_ = new SrsLatestVersion();
+    ppid = ::getppid();
+
     rtmp_listener_ = new SrsMultipleTcpListeners(this);
     api_listener_ = new SrsTcpListener(this);
     apis_listener_ = new SrsTcpListener(this);
@@ -333,7 +335,6 @@ SrsServer::SrsServer()
     webrtc_listener_ = new SrsTcpListener(this);
     stream_caster_flv_listener_ = new SrsHttpFlvListener();
     stream_caster_mpegts_ = new SrsUdpCasterListener();
-    ppid = ::getppid();
     
     // donot new object in constructor,
     // for some global instance is not ready now,

trunk/src/app/srs_app_source.cpp

@@ -2711,7 +2711,7 @@ void SrsLiveSource::on_consumer_destroy(SrsLiveConsumer* consumer)
     std::vector<SrsLiveConsumer*>::iterator it;
     it = std::find(consumers.begin(), consumers.end(), consumer);
     if (it != consumers.end()) {
-        consumers.erase(it);
+        it = consumers.erase(it);
     }
     
     if (consumers.empty()) {

trunk/src/app/srs_app_srt_source.cpp

@@ -741,7 +741,7 @@ void SrsSrtSource::on_consumer_destroy(SrsSrtConsumer* consumer)
     std::vector<SrsSrtConsumer*>::iterator it;
     it = std::find(consumers.begin(), consumers.end(), consumer);
     if (it != consumers.end()) {
-        consumers.erase(it);
+        it = consumers.erase(it);
     }
 }
 

trunk/src/app/srs_app_threads.cpp

@@ -17,12 +17,10 @@
 #include <srs_app_log.hpp>
 #include <srs_app_async_call.hpp>
 #include <srs_app_tencentcloud.hpp>
-
 #ifdef SRS_RTC
 #include <srs_app_rtc_dtls.hpp>
 #include <srs_app_rtc_conn.hpp>
 #endif
-
 #ifdef SRS_SRT
 #include <srs_app_srt_source.hpp>
 #endif