sharpetronics/QGIS
1
0
Fork 0
mirror of https://github.com/qgis/QGIS.git synced 2025-02-26 00:02:08 -05:00
Code Issues Packages Projects Releases Wiki Activity

fix #1203

Browse Source 
git-svn-id: http://svn.osgeo.org/qgis/trunk@10533 c8812cc2-4d05-0410-92ff-de0c093fc19c
This commit is contained in:
jef 2009-04-11 19:39:15 +00:00
parent 29473eac43
commit d3a38b04c1
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/core/qgsrunprocess.cpp
View File

@ -47,9 +47,6 @@ QgsRunProcess::QgsRunProcess( const QString& action, bool capture )
// inside the capture if() statement.
connect( mProcess, SIGNAL( finished( int, QProcess::ExitStatus ) ), this, SLOT( processExit( int, QProcess::ExitStatus ) ) );
// start the process!
mProcess->start( action );
// Use QgsMessageOutput for displaying output to user
// It will delete itself when the dialog box is closed.
mOutput = QgsMessageOutput::createMessageOutput();
@ -63,6 +60,9 @@ QgsRunProcess::QgsRunProcess( const QString& action, bool capture )
{
connect( mOutputObj, SIGNAL( destroyed() ), this, SLOT( dialogGone() ) );
}
// start the process!
mProcess->start( action );
}
else
{
@ -133,6 +133,8 @@ void QgsRunProcess::dialogGone()
// class being called after it has been deleted (Qt seems not to be
// disconnecting them itself)
mOutput = 0;
disconnect( mProcess, SIGNAL( error( QProcess::ProcessError ) ), this, SLOT( processError( QProcess::ProcessError ) ) );
disconnect( mProcess, SIGNAL( readyReadStandardOutput() ), this, SLOT( stdoutAvailable() ) );
disconnect( mProcess, SIGNAL( readyReadStandardError() ), this, SLOT( stderrAvailable() ) );
@ -145,7 +147,7 @@ void QgsRunProcess::processError( QProcess::ProcessError err )
{
if ( err == QProcess::FailedToStart )
{
QgsMessageOutput* output = QgsMessageOutput::createMessageOutput();
QgsMessageOutput* output = mOutput ? mOutput : QgsMessageOutput::createMessageOutput();
output->setMessage( tr( "Unable to run command %1" ).arg( mCommand ), QgsMessageOutput::MessageText );
// Didn't work, so no need to hang around
die();