Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
fix #1203
git-svn-id: http://svn.osgeo.org/qgis/trunk/qgis@10533 c8812cc2-4d05-0410-92ff-de0c093fc19c
  • Loading branch information
jef committed Apr 11, 2009
1 parent 50d1199 commit bf35481
Showing 1 changed file with 6 additions and 4 deletions.
10 changes: 6 additions & 4 deletions src/core/qgsrunprocess.cpp
Expand Up @@ -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();
Expand All @@ -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
{
Expand Down Expand Up @@ -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() ) );
Expand All @@ -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();
Expand Down

0 comments on commit bf35481

Please sign in to comment.