fix crash in SPIT plugin

qgis · Sep 6, 2013 · 0e976f4 · 0e976f4
1 parent 86ea4f3
commit 0e976f4
Showing 1 changed file with 18 additions and 14 deletions.
diff --git a/src/plugins/spit/qgsspitplugin.cpp b/src/plugins/spit/qgsspitplugin.cpp
@@ -93,6 +93,7 @@ void QgsSpitPlugin::unload()
   qI->removeDatabaseToolBarIcon( spitAction );
   qI->removePluginDatabaseMenu( tr( "&Spit" ), spitAction );
   delete spitAction;
+  spitAction = 0;
 }
 
 //! Set icons to the current theme
@@ -102,21 +103,24 @@ void QgsSpitPlugin::setCurrentTheme( QString theThemeName )
   QString myCurThemePath = QgsApplication::activeThemePath() + "/plugins/spit.png";
   QString myDefThemePath = QgsApplication::defaultThemePath() + "/plugins/spit.png";
   QString myQrcPath = ":/spit.png";
-  if ( QFile::exists( myCurThemePath ) )
+  if ( spitAction )
   {
-    spitAction->setIcon( QIcon( myCurThemePath ) );
-  }
-  else if ( QFile::exists( myDefThemePath ) )
-  {
-    spitAction->setIcon( QIcon( myDefThemePath ) );
-  }
-  else if ( QFile::exists( myQrcPath ) )
-  {
-    spitAction->setIcon( QIcon( myQrcPath ) );
-  }
-  else
-  {
-    spitAction->setIcon( QIcon() );
+    if ( QFile::exists( myCurThemePath ) )
+    {
+      spitAction->setIcon( QIcon( myCurThemePath ) );
+    }
+    else if ( QFile::exists( myDefThemePath ) )
+    {
+      spitAction->setIcon( QIcon( myDefThemePath ) );
+    }
+    else if ( QFile::exists( myQrcPath ) )
+    {
+      spitAction->setIcon( QIcon( myQrcPath ) );
+    }
+    else
+    {
+      spitAction->setIcon( QIcon() );
+    }
   }
 }