apply patch for #3347 from kcube

git-svn-id: http://svn.osgeo.org/qgis/trunk/qgis@15175 c8812cc2-4d05-0410-92ff-de0c093fc19c
qgis · Feb 15, 2011 · a8fb1b4 · a8fb1b4
1 parent 237dc0a
commit a8fb1b4
Showing 1 changed file with 7 additions and 1 deletion.
diff --git a/src/gui/qgssearchquerybuilder.cpp b/src/gui/qgssearchquerybuilder.cpp
@@ -203,7 +203,7 @@ long QgsSearchQueryBuilder::countRecords( QString searchString )
     return -1;
 
   QgsSearchTreeNode* searchTree = search.tree();
-  if ( searchTree == NULL )
+  if ( !searchTree )
   {
     // entered empty search string
     return mLayer->featureCount();
@@ -235,6 +235,12 @@ long QgsSearchQueryBuilder::countRecords( QString searchString )
 
   QApplication::restoreOverrideCursor();
 
+  if ( searchTree->hasError() )
+  {
+    QMessageBox::critical( this, tr( "Error during search" ), searchTree->errorMsg() );
+    return -1;
+  }
+
   return count;
 }