[QGIS Commit] r8373 - in branches/rendercontext-branch/src: app gui

[svn_qgis at osgeo.org]

Author: mhugent
Date: 2008-04-19 04:54:11 -0400 (Sat, 19 Apr 2008)
New Revision: 8373

Modified:
   branches/rendercontext-branch/src/app/qgisapp.cpp
   branches/rendercontext-branch/src/gui/qgsmapcanvas.cpp
Log:
stop rendering with esc-key also if mapcanvas has focus

Modified: branches/rendercontext-branch/src/app/qgisapp.cpp
===================================================================
--- branches/rendercontext-branch/src/app/qgisapp.cpp	2008-04-18 16:56:35 UTC (rev 8372)
+++ branches/rendercontext-branch/src/app/qgisapp.cpp	2008-04-19 08:54:11 UTC (rev 8373)
@@ -5330,8 +5330,10 @@
 	    }
 	}
     }
-
-  e->ignore();
+  else
+    {
+      e->ignore();
+    }
 }
     
 // Debug hook - used to output diagnostic messages when evoked (usually from the menu)

Modified: branches/rendercontext-branch/src/gui/qgsmapcanvas.cpp
===================================================================
--- branches/rendercontext-branch/src/gui/qgsmapcanvas.cpp	2008-04-18 16:56:35 UTC (rev 8372)
+++ branches/rendercontext-branch/src/gui/qgsmapcanvas.cpp	2008-04-19 08:54:11 UTC (rev 8373)
@@ -580,7 +580,7 @@
 
   if(mDrawing)
     {
-      return;
+      e->ignore();
     }
 
   emit keyPressed(e);