Added 0 pointer checks to saveAs

git-svn-id: http://svn.osgeo.org/qgis/trunk@13281 c8812cc2-4d05-0410-92ff-de0c093fc19c
qgis · Apr 8, 2010 · 81cd2a5 · 81cd2a5
1 parent 7d888d4
commit 81cd2a5
Showing 1 changed file with 18 additions and 4 deletions.
diff --git a/src/app/qgisapp.cpp b/src/app/qgisapp.cpp
@@ -3134,7 +3134,7 @@ void QgisApp::newSpatialiteLayer()
   QString baseSQL;
   if ( spatialiteDialog.includePrimaryKey() )
   {
-    baseSQL = "create table %1(pkuid integer primary key autoincrement, "; 
+    baseSQL = "create table %1(pkuid integer primary key autoincrement, ";
   }
   else
   {
@@ -3911,12 +3911,26 @@ void QgisApp::attributeTable()
 
 void QgisApp::saveAsVectorFile()
 {
-  mMapLegend->currentLegendLayer()->saveAsVectorFile();
+  if ( mMapLegend )
+  {
+    QgsLegendLayer* currentLegendLayer = mMapLegend->currentLegendLayer();
+    if ( currentLegendLayer )
+    {
+      currentLegendLayer->saveAsVectorFile();
+    }
+  }
 }
 
 void QgisApp::saveSelectionAsVectorFile()
 {
-  mMapLegend->currentLegendLayer()->saveSelectionAsVectorFile();
+  if ( mMapLegend )
+  {
+    QgsLegendLayer* currentLegendLayer = mMapLegend->currentLegendLayer();
+    if ( currentLegendLayer )
+    {
+      currentLegendLayer->saveSelectionAsVectorFile();
+    }
+  }
 }
 
 void QgisApp::layerProperties()
@@ -6720,7 +6734,7 @@ void QgisApp::namUpdate()
   }
 
 #if QT_VERSION >= 0x40500
-  if( !mProxyFactory )
+  if ( !mProxyFactory )
   {
     mProxyFactory = new QgsNetworkProxyFactory();
     mNAM->setProxyFactory( mProxyFactory );