Skip to content

Commit a8fb1b4

Browse files
author
jef
committed
apply patch for #3347 from kcube
git-svn-id: http://svn.osgeo.org/qgis/trunk/qgis@15175 c8812cc2-4d05-0410-92ff-de0c093fc19c
1 parent 237dc0a commit a8fb1b4

File tree

1 file changed

+7
-1
lines changed

1 file changed

+7
-1
lines changed

src/gui/qgssearchquerybuilder.cpp

+7-1
Original file line numberDiff line numberDiff line change
@@ -203,7 +203,7 @@ long QgsSearchQueryBuilder::countRecords( QString searchString )
203203
return -1;
204204

205205
QgsSearchTreeNode* searchTree = search.tree();
206-
if ( searchTree == NULL )
206+
if ( !searchTree )
207207
{
208208
// entered empty search string
209209
return mLayer->featureCount();
@@ -235,6 +235,12 @@ long QgsSearchQueryBuilder::countRecords( QString searchString )
235235

236236
QApplication::restoreOverrideCursor();
237237

238+
if ( searchTree->hasError() )
239+
{
240+
QMessageBox::critical( this, tr( "Error during search" ), searchTree->errorMsg() );
241+
return -1;
242+
}
243+
238244
return count;
239245
}
240246

0 commit comments

Comments
 (0)