fix crash in Dxf2Shp plugin

qgis · Sep 4, 2013 · 0ff6341 · 0ff6341
1 parent fbf8225
commit 0ff6341
Showing 1 changed file with 18 additions and 14 deletions.
diff --git a/src/plugins/dxf2shp_converter/dxf2shpconverter.cpp b/src/plugins/dxf2shp_converter/dxf2shpconverter.cpp
@@ -115,6 +115,7 @@ void dxf2shpConverter::unload()
   mQGisIface->removePluginVectorMenu( tr( "&Dxf2Shp" ), mQActionPointer );
   mQGisIface->removeVectorToolBarIcon( mQActionPointer );
   delete mQActionPointer;
+  mQActionPointer = 0;
 }
 
 void dxf2shpConverter::addMyLayer( QString myfname, QString mytitle )
@@ -129,21 +130,24 @@ void dxf2shpConverter::setCurrentTheme( QString theThemeName )
   QString myCurThemePath = QgsApplication::activeThemePath() + "/plugins/dxf2shp_converter.png";
   QString myDefThemePath = QgsApplication::defaultThemePath() + "/plugins/dxf2shp_converter.png";
   QString myQrcPath = ":/dxf2shp_converter.png";
-  if ( QFile::exists( myCurThemePath ) )
+  if ( mQActionPointer )
   {
-    mQActionPointer->setIcon( QIcon( myCurThemePath ) );
+    if ( QFile::exists( myCurThemePath ) )
-  }
+    {
-  else if ( QFile::exists( myDefThemePath ) )
+      mQActionPointer->setIcon( QIcon( myCurThemePath ) );
-  {
+    }
-    mQActionPointer->setIcon( QIcon( myDefThemePath ) );
+    else if ( QFile::exists( myDefThemePath ) )
-  }
+    {
-  else if ( QFile::exists( myQrcPath ) )
+      mQActionPointer->setIcon( QIcon( myDefThemePath ) );
-  {
+    }
-    mQActionPointer->setIcon( QIcon( myQrcPath ) );
+    else if ( QFile::exists( myQrcPath ) )
-  }
+    {
-  else
+      mQActionPointer->setIcon( QIcon( myQrcPath ) );
-  {
+    }
-    mQActionPointer->setIcon( QIcon() );
+    else
+    {
+      mQActionPointer->setIcon( QIcon() );
+    }
   }
 }