grass: fix relative path support for working database and vector laye…

…rs (fixes #12725) (cherry picked from commit e5dbd18)
qgis · May 27, 2015 · 3dd8008 · 3dd8008
1 parent f68cfc7
commit 3dd8008
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 4 deletions.
diff --git a/src/core/qgsproject.cpp b/src/core/qgsproject.cpp
@@ -1479,7 +1479,7 @@ QString QgsProject::writePath( QString src, QString relativeBasePath ) const
 
   QFileInfo srcFileInfo( src );
   QFileInfo projFileInfo( fileName() );
-  QString srcPath = srcFileInfo.canonicalFilePath();
+  QString srcPath = srcFileInfo.exists() ? srcFileInfo.canonicalFilePath() : src;
   QString projPath = projFileInfo.canonicalFilePath();
 
   if ( !relativeBasePath.isNull() )

diff --git a/src/plugins/grass/qgsgrassplugin.cpp b/src/plugins/grass/qgsgrassplugin.cpp
@@ -310,7 +310,7 @@ void QgsGrassPlugin::saveMapset()
 
   // Save working mapset in project file
   QgsProject::instance()->writeEntry( "GRASS", "/WorkingGisdbase",
-                                      QgsGrass::getDefaultGisdbase() );
+                                      QgsProject::instance()->writePath( QgsGrass::getDefaultGisdbase() ) );
 
   QgsProject::instance()->writeEntry( "GRASS", "/WorkingLocation",
                                       QgsGrass::getDefaultLocation() );
@@ -802,8 +802,10 @@ void QgsGrassPlugin::projectRead()
   QgsDebugMsg( "entered." );
 
   bool ok;
-  QString gisdbase = QgsProject::instance()->readEntry(
+  QString gisdbase = QgsProject::instance()->readPath(
-                       "GRASS", "/WorkingGisdbase", "", &ok ).trimmed();
+                       QgsProject::instance()->readEntry(
+                         "GRASS", "/WorkingGisdbase", "", &ok ).trimmed()
+                     );
   QString location = QgsProject::instance()->readEntry(
                        "GRASS", "/WorkingLocation", "", &ok ).trimmed();
   QString mapset = QgsProject::instance()->readEntry(