[QGIS Commit] r12603 - trunk/qgis/src/app

[svn_qgis at osgeo.org]

Author: jef
Date: 2009-12-23 15:51:01 -0500 (Wed, 23 Dec 2009)
New Revision: 12603

Modified:
   trunk/qgis/src/app/qgsmaptoolidentify.cpp
   trunk/qgis/src/app/qgsoptions.cpp
Log:
fix #2264

Modified: trunk/qgis/src/app/qgsmaptoolidentify.cpp
===================================================================
--- trunk/qgis/src/app/qgsmaptoolidentify.cpp	2009-12-23 19:56:04 UTC (rev 12602)
+++ trunk/qgis/src/app/qgsmaptoolidentify.cpp	2009-12-23 20:51:01 UTC (rev 12603)
@@ -206,6 +206,9 @@
   double identifyValue = settings.value( "/Map/identifyRadius", QGis::DEFAULT_IDENTIFY_RADIUS ).toDouble();
   QString ellipsoid = settings.value( "/qgis/measure/ellipsoid", "WGS84" ).toString();
 
+  if ( identifyValue <= 0.0 )
+    identifyValue = QGis::DEFAULT_IDENTIFY_RADIUS;
+
   int featureCount = 0;
   const QgsFieldMap& fields = layer->pendingFields();
 

Modified: trunk/qgis/src/app/qgsoptions.cpp
===================================================================
--- trunk/qgis/src/app/qgsoptions.cpp	2009-12-23 19:56:04 UTC (rev 12602)
+++ trunk/qgis/src/app/qgsoptions.cpp	2009-12-23 20:51:01 UTC (rev 12603)
@@ -59,6 +59,9 @@
   cbxAutoFeatureForm->setChecked( settings.value( "/Map/identifyAutoFeatureForm", false ).toBool() );
   double identifyValue = settings.value( "/Map/identifyRadius", QGis::DEFAULT_IDENTIFY_RADIUS ).toDouble();
   QgsDebugMsg( QString( "Standard Identify radius setting read from settings file: %1" ).arg( identifyValue ) );
+  if ( identifyValue <= 0.0 )
+    identifyValue = QGis::DEFAULT_IDENTIFY_RADIUS;
+  spinBoxIdentifyValue->setMinimum( 0.01 );
   spinBoxIdentifyValue->setValue( identifyValue );