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

nirvn · nirvn · commit d332292863b4 · 2019-04-18T14:40:15.000+07:00
diff --git a/src/providers/ogr/qgsogrprovider.cpp b/src/providers/ogr/qgsogrprovider.cpp
@@ -4525,10 +4525,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
`@@ -4525,10 +4525,11 @@ void QgsOgrProvider::close()`
`4525`	`4525`
`4526`	`4526`	`void QgsOgrProvider::reloadData()`
`4527`	`4527`	`{`
	`4528`	`+ bool wasValid = mValid;`
`4528`	`4529`	`forceReload();`
`4529`	`4530`	`close();`
`4530`	`4531`	`open( OpenModeSameAsCurrent );`
`4531`		`- if ( !mValid )`
	`4532`	`+ if ( !mValid && wasValid )`
`4532`	`4533`	`pushError( tr( "Cannot reopen datasource %1" ).arg( dataSourceUri() ) );`
`4533`	`4534`	`}`
`4534`	`4535`