astyle formatting

[ci skip]
This commit is contained in:
Daniel Marjamäki 2020-04-05 10:57:51 +02:00
parent 60f9fefcd4
commit 189cf29597
1 changed files with 6 additions and 6 deletions

View File

@ -132,14 +132,13 @@ namespace {
args += " " + v.get<std::string>();
}
if(obj.count("python")) {
if (obj.count("python")) {
// Python was defined in the config file
if (obj["python"].is<picojson::array>()){
if (obj["python"].is<picojson::array>()) {
return "Loading " + fileName +" failed. python must not be an array.";
}
python = obj["python"].get<std::string>();
}
else{
} else {
python = "";
}
@ -150,11 +149,12 @@ namespace {
static std::string executeAddon(const AddonInfo &addonInfo,
const std::string &defaultPythonExe,
const std::string &dumpFile) {
const std::string &dumpFile)
{
std::string pythonExe = (addonInfo.python != "") ? addonInfo.python : defaultPythonExe;
if(pythonExe.find(" ") != std::string::npos){
if (pythonExe.find(" ") != std::string::npos) {
// popen strips the first quote. Needs 2 sets to fully quote.
pythonExe = "\"\"" + pythonExe + "\"\"";
}