fix #2227

git-svn-id: http://svn.osgeo.org/qgis/trunk/qgis@15784 c8812cc2-4d05-0410-92ff-de0c093fc19c
qgis · Apr 20, 2011 · 95e70f0 · 95e70f0
1 parent 636f7e3
commit 95e70f0
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 2 deletions.
diff --git a/src/plugins/gps_importer/qgsbabelformat.cpp b/src/plugins/gps_importer/qgsbabelformat.cpp
@@ -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;
 }
 

diff --git a/src/plugins/gps_importer/qgsgpsplugin.cpp b/src/plugins/gps_importer/qgsgpsplugin.cpp
@@ -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" )