[QGIS Commit] r15175 - trunk/qgis/src/gui

[svn_qgis at osgeo.org]

Author: jef
Date: 2011-02-15 01:20:27 -0800 (Tue, 15 Feb 2011)
New Revision: 15175

Modified:
   trunk/qgis/src/gui/qgssearchquerybuilder.cpp
Log:
apply patch for #3347 from kcube

Modified: trunk/qgis/src/gui/qgssearchquerybuilder.cpp
===================================================================
--- trunk/qgis/src/gui/qgssearchquerybuilder.cpp	2011-02-15 07:22:37 UTC (rev 15174)
+++ trunk/qgis/src/gui/qgssearchquerybuilder.cpp	2011-02-15 09:20:27 UTC (rev 15175)
@@ -203,7 +203,7 @@
     return -1;
 
   QgsSearchTreeNode* searchTree = search.tree();
-  if ( searchTree == NULL )
+  if ( !searchTree )
   {
     // entered empty search string
     return mLayer->featureCount();
@@ -235,6 +235,12 @@
 
   QApplication::restoreOverrideCursor();
 
+  if ( searchTree->hasError() )
+  {
+    QMessageBox::critical( this, tr( "Error during search" ), searchTree->errorMsg() );
+    return -1;
+  }
+
   return count;
 }