hydrar/mistserver
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'development' into LTS_development

Browse source 
# Conflicts:
#	src/input/input.cpp
This commit is contained in:
Thulinma 2017-10-24 14:09:13 +02:00
commit cac503f774
7 changed files with 218 additions and 133 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/controller/controller_connectors.cpp
View file

@ -97,7 +97,9 @@ namespace Controller {
p[it.key()] = p[it.key()].asString();
if (p[it.key()].asStringRef().size() > 0){
argarr[argnum++] = (char*)((*it)["option"].asStringRef().c_str());
argarr[argnum++] = (char*)(p[it.key()].asStringRef().c_str());
if (it->isMember("type")){
argarr[argnum++] = (char*)(p[it.key()].asStringRef().c_str());
}
}
}else{
if (it.key() == "debug"){