胡斌

fix the bug of set_config_static doesn't take effect when reload

@@ -1011,6 +1011,8 @@ int SrsConfig::reload_conf(SrsConfig* conf) @@ -1011,6 +1011,8 @@ int SrsConfig::reload_conf(SrsConfig* conf)
1011 return ret; 1011 return ret;
1012 } 1012 }
1013 1013
  1014 + set_config_static();
  1015 +
1014 return ret; 1016 return ret;
1015 } 1017 }
1016 1018
@@ -2095,6 +2097,10 @@ int SrsConfig::check_config() @@ -2095,6 +2097,10 @@ int SrsConfig::check_config()
2095 2097
2096 void SrsConfig::set_config_static() 2098 void SrsConfig::set_config_static()
2097 { 2099 {
  2100 + if(this != _srs_config){
  2101 + return;
  2102 + }
  2103 +
2098 SrsConfDirective* conf = root->get("speex2aac"); 2104 SrsConfDirective* conf = root->get("speex2aac");
2099 if(conf){ 2105 if(conf){
2100 if(conf->arg0() == "on"){ 2106 if(conf->arg0() == "on"){