From f6e43c76d81a04848a8a8740df403e6ddcb2144c Mon Sep 17 00:00:00 2001
From: jef <jef@c8812cc2-4d05-0410-92ff-de0c093fc19c>
Date: Sat, 30 Aug 2008 14:51:44 +0000
Subject: [PATCH] fix #1257

git-svn-id: http://svn.osgeo.org/qgis/trunk@9217 c8812cc2-4d05-0410-92ff-de0c093fc19c
---
 src/plugins/grid_maker/graticulecreator.cpp | 6 +++++-
 src/plugins/grid_maker/plugingui.cpp        | 8 ++++++++
 2 files changed, 13 insertions(+), 1 deletion(-)

diff --git a/src/plugins/grid_maker/graticulecreator.cpp b/src/plugins/grid_maker/graticulecreator.cpp
index 06b8a6db3df..df75dda6c12 100644
--- a/src/plugins/grid_maker/graticulecreator.cpp
+++ b/src/plugins/grid_maker/graticulecreator.cpp
@@ -50,7 +50,7 @@ GraticuleCreator::~GraticuleCreator()
 {
 }
 
-//TODO: check for rediculous intervals!
+//TODO: check for ridiculous intervals!
 void GraticuleCreator::generatePointGraticule(
   double theXInterval,
   double theYInterval,
@@ -68,6 +68,10 @@ void GraticuleCreator::generatePointGraticule(
                                 mFields,
                                 QGis::WKBPoint,
                                 &mCRS );
+
+  if( theXInterval==0.0 || theYInterval==0.0 )
+    return;
+
   //
   // Order our loop so that it goes from smallest to biggest
   //
diff --git a/src/plugins/grid_maker/plugingui.cpp b/src/plugins/grid_maker/plugingui.cpp
index 96f805d43a1..844644fd1c6 100644
--- a/src/plugins/grid_maker/plugingui.cpp
+++ b/src/plugins/grid_maker/plugingui.cpp
@@ -56,6 +56,14 @@ void QgsGridMakerPluginGui::on_buttonBox_accepted()
 
   double myXInterval =  leXInterval->text().toDouble();
   double myYInterval =  leYInterval->text().toDouble();
+
+  if( myXInterval==0.0 || myYInterval==0.0 )
+  {
+    QMessageBox::warning( 0, tr( "QGIS - Grid Maker" ),
+                          QString( tr( "Please enter intervals before pressing OK!" ) ) );
+    return;
+  }
+
   double myXOrigin =  leXLowerLeft->text().toDouble();
   double myYOrigin =  leYLowerLeft->text().toDouble();
   double myEndPointX = leXUpperRight->text().toDouble();