apply fix to extscripts

This commit is contained in:
arcan1s 2014-12-22 06:19:25 +03:00
parent 8f1e8606d4
commit d1d4a97fa4

View File

@ -263,7 +263,8 @@ ExtScript::ScriptData ExtScript::run(const int time)
TaskResult process = runTask(cmdList.join(QChar(' '))); TaskResult process = runTask(cmdList.join(QChar(' ')));
if (debug) qDebug() << PDEBUG << ":" << "Cmd returns" << process.exitCode; if (debug) qDebug() << PDEBUG << ":" << "Cmd returns" << process.exitCode;
QString info = QTextCodec::codecForMib(106)->toUnicode(process.error).trimmed(); QString info = QString::number(process.exitCode) + QString(":") +
QTextCodec::codecForMib(106)->toUnicode(process.error).trimmed();
QString qoutput = QTextCodec::codecForMib(106)->toUnicode(process.output).trimmed(); QString qoutput = QTextCodec::codecForMib(106)->toUnicode(process.output).trimmed();
switch(_redirect) { switch(_redirect) {
case stdout2stderr: case stdout2stderr:
@ -278,8 +279,6 @@ ExtScript::ScriptData ExtScript::run(const int time)
response.output = qoutput; response.output = qoutput;
break; break;
} }
if (!_output)
response.output = QString::number(process.exitCode);
return response; return response;
} }