[QGIS Commit] r15784 - trunk/qgis/src/plugins/gps_importer

svn_qgis at osgeo.org svn_qgis at osgeo.org
Wed Apr 20 17:24:09 EDT 2011


Author: jef
Date: 2011-04-20 14:24:09 -0700 (Wed, 20 Apr 2011)
New Revision: 15784

Modified:
   trunk/qgis/src/plugins/gps_importer/qgsbabelformat.cpp
   trunk/qgis/src/plugins/gps_importer/qgsgpsplugin.cpp
Log:
fix #2227

Modified: trunk/qgis/src/plugins/gps_importer/qgsbabelformat.cpp
===================================================================
--- trunk/qgis/src/plugins/gps_importer/qgsbabelformat.cpp	2011-04-20 21:23:47 UTC (rev 15783)
+++ trunk/qgis/src/plugins/gps_importer/qgsbabelformat.cpp	2011-04-20 21:24:09 UTC (rev 15784)
@@ -106,7 +106,14 @@
     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;
 }
 

Modified: trunk/qgis/src/plugins/gps_importer/qgsgpsplugin.cpp
===================================================================
--- trunk/qgis/src/plugins/gps_importer/qgsgpsplugin.cpp	2011-04-20 21:23:47 UTC (rev 15783)
+++ trunk/qgis/src/plugins/gps_importer/qgsgpsplugin.cpp	2011-04-20 21:24:09 UTC (rev 15784)
@@ -280,8 +280,10 @@
       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" )



More information about the QGIS-commit mailing list