[GRASS] catch fatal error when G_get_gdal_link fails

qgis · Sep 9, 2015 · ef1be5c · ef1be5c
1 parent f9460f9
commit ef1be5c
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 7 deletions.
diff --git a/src/providers/grass/qgsgrass.cpp b/src/providers/grass/qgsgrass.cpp
@@ -2245,15 +2245,24 @@ bool QgsGrass::isExternal( const QgsGrassObject & object )
   {
     return false;
   }
+  lock();
   bool isExternal = false;
-  QgsGrass::setLocation( object.gisdbase(), object.location() );
-  struct GDAL_link *gdal;
-  gdal = G_get_gdal_link( object.name().toUtf8().data(), object.mapset().toUtf8().data() );
-  if ( gdal )
+  G_TRY
+  {
+    QgsGrass::setLocation( object.gisdbase(), object.location() );
+    struct GDAL_link *gdal;
+    gdal = G_get_gdal_link( object.name().toUtf8().data(), object.mapset().toUtf8().data() );
+    if ( gdal )
+    {
+      isExternal = true;
+      G_close_gdal_link( gdal );
+    }
+  }
+  G_CATCH( QgsGrass::Exception &e )
   {
-    isExternal = true;
-    G_close_gdal_link( gdal );
+    QgsDebugMsg( "error getting external link: " + QString(e.what()) );
   }
+  unlock();
   return isExternal;
 }
 

diff --git a/src/providers/grass/qgsgrassimport.cpp b/src/providers/grass/qgsgrassimport.cpp
@@ -662,7 +662,7 @@ bool QgsGrassExternal::import()
 
   try
   {
-    QString cmd = "r.external";
+    QString cmd = QgsGrass::gisbase() + "/bin/r.external";
     QStringList arguments;
 
     if ( QFileInfo( mSource ).exists() )