Skip to content
Permalink
Browse files

[GRASS] fixed deadlock when started from GRASS shell

  • Loading branch information
blazek committed Oct 8, 2015
1 parent 3520f03 commit af6f467929f2f6ed3947ab24c9ac460904faf73c
Showing with 8 additions and 6 deletions.
  1. +8 −6 src/providers/grass/qgsgrass.cpp
@@ -357,12 +357,6 @@ bool QgsGrass::init( void )
return false;
}

if ( active )
{
QgsGrass::instance()->loadMapsetSearchPath(); // must be after G_no_gisinit()
QgsGrass::instance()->setMapsetSearchPathWatcher();
}

// I think that mask should not be used in QGIS as it can only confuses people,
// anyway, I don't think anybody is using MASK
// TODO7: Rast_suppress_masking (see G_suppress_masking() macro above) needs MAPSET
@@ -474,6 +468,14 @@ bool QgsGrass::init( void )
}

unlock();

// after unlock because it is using setMapset() which calls init()
if ( active )
{
QgsGrass::instance()->loadMapsetSearchPath(); // must be after G_no_gisinit()
QgsGrass::instance()->setMapsetSearchPathWatcher();
}

return true;
}

0 comments on commit af6f467

Please sign in to comment.
You can’t perform that action at this time.