[ogr] Only throw validity error in reloadData() when previously valid

nirvn · nirvn · commit 54a06fb8c09a · 2019-04-18T16:00:47.000+07:00
diff --git a/src/providers/ogr/qgsogrprovider.cpp b/src/providers/ogr/qgsogrprovider.cpp
@@ -4281,10 +4281,11 @@ void QgsOgrProvider::close()
 
 void QgsOgrProvider::reloadData()
 {
+  bool wasValid = mValid;
   forceReload();
   close();
   open( OpenModeSameAsCurrent );
-  if ( !mValid )
+  if ( !mValid && wasValid )
     pushError( tr( "Cannot reopen datasource %1" ).arg( dataSourceUri() ) );
 }
 

Original file line number	Diff line number	Diff line change
`@@ -4281,10 +4281,11 @@ void QgsOgrProvider::close()`
`4281`	`4281`
`4282`	`4282`	`void QgsOgrProvider::reloadData()`
`4283`	`4283`	`{`
	`4284`	`+ bool wasValid = mValid;`
`4284`	`4285`	`forceReload();`
`4285`	`4286`	`close();`
`4286`	`4287`	`open( OpenModeSameAsCurrent );`
`4287`		`- if ( !mValid )`
	`4288`	`+ if ( !mValid && wasValid )`
`4288`	`4289`	`pushError( tr( "Cannot reopen datasource %1" ).arg( dataSourceUri() ) );`
`4289`	`4290`	`}`
`4290`	`4291`