Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
Fix loss of attributes for OGR provider (followup 72c9830)
Cherry-picked from cc13c57
  • Loading branch information
nyalldawson committed Jun 30, 2015
1 parent 86fe4d5 commit 3738c91
Showing 1 changed file with 9 additions and 7 deletions.
16 changes: 9 additions & 7 deletions src/providers/ogr/qgsogrprovider.cpp
Expand Up @@ -1284,6 +1284,7 @@ bool QgsOgrProvider::changeAttributeValues( const QgsChangedAttributesMap &attr_
{
pushError( tr( "OGR error syncing to disk: %1" ).arg( CPLGetLastErrorMsg() ) );
}
QgsOgrConnPool::instance()->invalidateConnections( filePath() );
return true;
}

Expand Down Expand Up @@ -1348,6 +1349,7 @@ bool QgsOgrProvider::changeGeometryValues( QgsGeometryMap & geometry_map )

OGR_F_Destroy( theOGRFeature );
}
QgsOgrConnPool::instance()->invalidateConnections( filePath() );
return syncToDisc();
}

Expand Down Expand Up @@ -1607,17 +1609,17 @@ static QString createFileFilter_( QString const &longName, QString const &glob )

QString createFilters( QString type )
{
/**Database drivers available*/
/** Database drivers available*/
static QString myDatabaseDrivers;
/**Protocol drivers available*/
/** Protocol drivers available*/
static QString myProtocolDrivers;
/**File filters*/
/** File filters*/
static QString myFileFilters;
/**Directory drivers*/
/** Directory drivers*/
static QString myDirectoryDrivers;
/**Extensions*/
/** Extensions*/
static QStringList myExtensions;
/**Wildcards*/
/** Wildcards*/
static QStringList myWildcards;

// if we've already built the supported vector string, just return what
Expand Down Expand Up @@ -2014,7 +2016,7 @@ QGISEXTERN bool isProvider()
return true;
}

/**Creates an empty data source
/** Creates an empty data source
@param uri location to store the file(s)
@param format data format (e.g. "ESRI Shapefile"
@param vectortype point/line/polygon or multitypes
Expand Down

0 comments on commit 3738c91

Please sign in to comment.