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

nirvn · nirvn · commit 6724d01c2e43 · 2019-04-18T16:01:12.000+07:00
diff --git a/src/providers/ogr/qgsogrprovider.cpp b/src/providers/ogr/qgsogrprovider.cpp
@@ -4432,10 +4432,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
`@@ -4432,10 +4432,11 @@ void QgsOgrProvider::close()`
`4432`	`4432`
`4433`	`4433`	`void QgsOgrProvider::reloadData()`
`4434`	`4434`	`{`
	`4435`	`+ bool wasValid = mValid;`
`4435`	`4436`	`forceReload();`
`4436`	`4437`	`close();`
`4437`	`4438`	`open( OpenModeSameAsCurrent );`
`4438`		`- if ( !mValid )`
	`4439`	`+ if ( !mValid && wasValid )`
`4439`	`4440`	`pushError( tr( "Cannot reopen datasource %1" ).arg( dataSourceUri() ) );`
`4440`	`4441`	`}`
`4441`	`4442`