Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
grass: fix relative path support for working database and vector laye…
…rs (fixes #12725)
  • Loading branch information
jef-n committed May 9, 2015
1 parent eb716fc commit e5dbd18
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 4 deletions.
2 changes: 1 addition & 1 deletion src/core/qgsproject.cpp
Expand Up @@ -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() )
Expand Down
8 changes: 5 additions & 3 deletions src/plugins/grass/qgsgrassplugin.cpp
Expand Up @@ -303,7 +303,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() );
Expand Down Expand Up @@ -796,8 +796,10 @@ void QgsGrassPlugin::projectRead()
QgsDebugMsg( "entered." );

bool ok;
QString gisdbase = QgsProject::instance()->readEntry(
"GRASS", "/WorkingGisdbase", "", &ok ).trimmed();
QString gisdbase = QgsProject::instance()->readPath(
QgsProject::instance()->readEntry(
"GRASS", "/WorkingGisdbase", "", &ok ).trimmed()
);
QString location = QgsProject::instance()->readEntry(
"GRASS", "/WorkingLocation", "", &ok ).trimmed();
QString mapset = QgsProject::instance()->readEntry(
Expand Down

0 comments on commit e5dbd18

Please sign in to comment.