Skip to content

Commit

Permalink
fix #2227
Browse files Browse the repository at this point in the history
git-svn-id: http://svn.osgeo.org/qgis/trunk/qgis@15784 c8812cc2-4d05-0410-92ff-de0c093fc19c
  • Loading branch information
jef committed Apr 20, 2011
1 parent 636f7e3 commit 95e70f0
Show file tree
Hide file tree
Showing 2 changed files with 11 additions and 2 deletions.
9 changes: 8 additions & 1 deletion src/plugins/gps_importer/qgsbabelformat.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -106,7 +106,14 @@ QStringList QgsSimpleBabelFormat::importCommand( const QString& babel,
const QString& output )const
{
QStringList args;
args << babel << featuretype << "-i" << mFormat << "-o" << "gpx" << input << output;
args
<< QString( "\"%1\"" ).arg( babel )
<< featuretype
<< "-i"
<< mFormat
<< "-o" << "gpx"
<< QString( "\"%1\"" ).arg( input )
<< QString( "\"%1\"" ).arg( output );
return args;
}

Expand Down
4 changes: 3 additions & 1 deletion src/plugins/gps_importer/qgsgpsplugin.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -280,8 +280,10 @@ void QgsGPSPlugin::importGPSFile( QString inputFileName, QgsBabelFormat* importe
return;
}

babelProcess.waitForFinished();

// did we get any data?
if ( babelProcess.exitStatus() != 0 )
if ( babelProcess.exitCode() != 0 )
{
QString babelError( babelProcess.readAllStandardError() );
QString errorMsg( tr( "Could not import data from %1!\n\n" )
Expand Down

0 comments on commit 95e70f0

Please sign in to comment.