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

[svn_qgis at osgeo.org]

Author: timlinux
Date: 2008-07-11 17:37:14 -0400 (Fri, 11 Jul 2008)
New Revision: 8757

Modified:
   trunk/qgis/src/app/qgisapp.cpp
Log:
Fix for crash scenario: If the first thing you do in qgis is open grass layer, edit it using grass edit tools then return to work with a non grass layer and touch the canvas qgis crashes because mNonEditMapTool is not initialised.

Modified: trunk/qgis/src/app/qgisapp.cpp
===================================================================
--- trunk/qgis/src/app/qgisapp.cpp	2008-07-11 21:16:47 UTC (rev 8756)
+++ trunk/qgis/src/app/qgisapp.cpp	2008-07-11 21:37:14 UTC (rev 8757)
@@ -1419,6 +1419,8 @@
   mMapTools.mAddRing = new QgsMapToolAddRing(mMapCanvas);
   mMapTools.mAddRing->setAction(mActionAddRing);
   mMapTools.mAddIsland = new QgsMapToolAddIsland(mMapCanvas);
+  //ensure that non edit tool is initialised or we will get crashes in some situations
+  mNonEditMapTool = mMapTools.mPan; 
 }
 
 void QgisApp::createOverview()