Attachment #215684 for bug #300180




{
	if( getRunning() )
	{
		qCritical("ExternProgram: program %s reported error %s!", _oProgramName.toAscii().constData(),
              QString( "%1 " + _poExternProgram->errorString() ).arg( _poExternProgram->error() ).toAscii().constData() );
		return;
	}
	// Check if the program exited normally else put out error message
	if( _poExternProgram->exitStatus() != QProcess::NormalExit ) {
		qCritical("ExternProgram: program %s didn't finish correctly! Exit code %s", _oProgramName.toAscii().constData(),
              QString( _poExternProgram->exitCode() + " " + _poExternProgram->errorString() ).toAscii().constData() );
		emit programExited( _poExternProgram->exitCode() );
	}

	if( _poExternProgram->error() == QProcess::FailedToStart ) {
		qCritical("ExternProgram: program %s didn't start correctly! Error code %s", _oProgramName.toAscii().constData(),
              QString( _poExternProgram->error() + " " + _poExternProgram->errorString() ).toAscii().constData() );
		emit programExited( -1 );
	}

Return to bug 300180

Lines 217-235 Link Here

(-)canorus-0.7svn.R1188/src/control/externprogram.cpp.orig (-3 / +3 lines)
217	{	217	{
218	if( getRunning() )	218	if( getRunning() )
219	{	219	{
220	qCritical("ExternProgram: program %s reported error %s!",	220	qCritical("ExternProgram: program %s reported error %s!", _oProgramName.toAscii().constData(),
221	QString( "%1 " + _poExternProgram->errorString() ).arg( _poExternProgram->error() ).toAscii().constData() );	221	QString( "%1 " + _poExternProgram->errorString() ).arg( _poExternProgram->error() ).toAscii().constData() );
222	return;	222	return;
223	}	223	}
224	// Check if the program exited normally else put out error message	224	// Check if the program exited normally else put out error message
225	if( _poExternProgram->exitStatus() != QProcess::NormalExit ) {	225	if( _poExternProgram->exitStatus() != QProcess::NormalExit ) {
226	qCritical("ExternProgram: program %s didn't finish correctly! Exit code %d", _oProgramName.toAscii().constData(),	226	qCritical("ExternProgram: program %s didn't finish correctly! Exit code %s", _oProgramName.toAscii().constData(),
227	QString( _poExternProgram->exitCode() + " " + _poExternProgram->errorString() ).toAscii().constData() );	227	QString( _poExternProgram->exitCode() + " " + _poExternProgram->errorString() ).toAscii().constData() );
228	emit programExited( _poExternProgram->exitCode() );	228	emit programExited( _poExternProgram->exitCode() );
229	}	229	}
230		230
231	if( _poExternProgram->error() == QProcess::FailedToStart ) {	231	if( _poExternProgram->error() == QProcess::FailedToStart ) {
232	qCritical("ExternProgram: program %s didn't start correctly! Error code %d", _oProgramName.toAscii().constData(),	232	qCritical("ExternProgram: program %s didn't start correctly! Error code %s", _oProgramName.toAscii().constData(),
233	QString( _poExternProgram->error() + " " + _poExternProgram->errorString() ).toAscii().constData() );	233	QString( _poExternProgram->error() + " " + _poExternProgram->errorString() ).toAscii().constData() );
234	emit programExited( -1 );	234	emit programExited( -1 );
235	}	235	}