Merge branch 'development' into LTS_development

This commit is contained in:
Thulinma 2019-09-09 16:05:49 +02:00
commit 351951f56c

View file

@ -108,14 +108,6 @@ namespace Mist{
args.push_back(Util::getMyPath() + "MistOutHTTP"); args.push_back(Util::getMyPath() + "MistOutHTTP");
args.push_back("--ip"); args.push_back("--ip");
args.push_back(myConn.getHost()); args.push_back(myConn.getHost());
if (config->getString("nostreamtext").size()){
args.push_back("--nostreamtext");
args.push_back(config->getString("nostreamtext"));
}
if (config->getString("pubaddr").size()){
args.push_back("--public-address");
args.push_back(config->getString("pubaddr"));
}
args.push_back(""); args.push_back("");
Util::Procs::socketList.insert(fd[0]); Util::Procs::socketList.insert(fd[0]);
pid_t http_proc = Util::Procs::StartPiped(args, &(fd[1]), &(fd[1]), &fderr); pid_t http_proc = Util::Procs::StartPiped(args, &(fd[1]), &(fd[1]), &fderr);