Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
[GRASS] fixed output map freeze in canvas on windows
  • Loading branch information
blazek committed Oct 19, 2015
1 parent 1132867 commit 1582f6a
Show file tree
Hide file tree
Showing 3 changed files with 10 additions and 5 deletions.
6 changes: 3 additions & 3 deletions src/providers/grass/qgsgrassprovider.cpp
Expand Up @@ -489,9 +489,9 @@ QVariant QgsGrassProvider::maxValue( int index )

bool QgsGrassProvider::isValid()
{
QgsDebugMsg( QString( "returned: %1" ).arg( mValid ) );

return mValid && mLayer && mLayer->map() && mLayer->map()->map();
bool valid = mValid && mLayer && mLayer->map() && mLayer->map()->map();
QgsDebugMsg( QString( "valid = %1" ).arg( valid ) );
return valid;
}

QgsCoordinateReferenceSystem QgsGrassProvider::crs()
Expand Down
8 changes: 6 additions & 2 deletions src/providers/grass/qgsgrassvectormap.cpp
Expand Up @@ -93,7 +93,7 @@ bool QgsGrassVectorMap::open()
void QgsGrassVectorMap::close()
{
QgsDebugMsg( toString() );
if ( mOpen )
if ( !mOpen )
{
QgsDebugMsg( "is not open" );
return;
Expand Down Expand Up @@ -738,8 +738,12 @@ QgsGrassVectorMap * QgsGrassVectorMapStore::openMap( const QgsGrassObject & gras
{
if ( m->grassObject() == grassObject )
{
QgsDebugMsg( "The map is already open" );
QgsDebugMsg( "The map already exists" );
map = m;
if ( !map->isOpen() )
{
map->open();
}
}
}

Expand Down
1 change: 1 addition & 0 deletions src/providers/grass/qgsgrassvectormap.h
Expand Up @@ -54,6 +54,7 @@ class GRASS_LIB_EXPORT QgsGrassVectorMap : public QObject
bool isValid() const { return mValid; }
bool isFrozen() const { return mFrozen; }
bool isEdited() const { return mIsEdited; }
bool isOpen() const { return mOpen; }
int version() const { return mVersion; }
int oldNumLines() const { return mOldNumLines; }
// number of instances using this map
Expand Down

0 comments on commit 1582f6a

Please sign in to comment.