Skip to content

Commit

Permalink
fix #2620
Browse files Browse the repository at this point in the history
git-svn-id: http://svn.osgeo.org/qgis/trunk@13431 c8812cc2-4d05-0410-92ff-de0c093fc19c
  • Loading branch information
jef committed May 6, 2010
1 parent 9218a05 commit 98ce9b6
Showing 1 changed file with 1 addition and 5 deletions.
6 changes: 1 addition & 5 deletions src/plugins/grass/qgsgrassmodule.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -345,19 +345,15 @@ QgsGrassModuleStandardOptions::QgsGrassModuleStandardOptions(
.arg( process.readAllStandardError().constData() ) );
return;
}
QByteArray gDescArray = process.readAllStandardOutput();
QByteArray errArray = process.readAllStandardError();

QDomDocument gDoc( "task" );
QString err;
int line, column;
if ( !gDoc.setContent(( QByteArray )gDescArray, &err, &line, &column ) )
if ( !gDoc.setContent( &process, false, &err, &line, &column ) )
{
QString errmsg = tr( "Cannot read module description (%1):" ).arg( mXName )
+ tr( "\n%1\nat line %2 column %3" ).arg( err ).arg( line ).arg( column );
QgsDebugMsg( errmsg );
QgsDebugMsg( QString( gDescArray ) );
QgsDebugMsg( QString( errArray ) );
QMessageBox::warning( 0, tr( "Warning" ), errmsg );
return;
}
Expand Down

0 comments on commit 98ce9b6

Please sign in to comment.