fix crash in Compass plugin

qgis · Sep 5, 2013 · 3896c73 · 3896c73
1 parent 37a20f4
commit 3896c73
Showing 1 changed file with 8 additions and 2 deletions.
diff --git a/src/plugins/compass/qgscompassplugin.cpp b/src/plugins/compass/qgscompassplugin.cpp
@@ -145,15 +145,21 @@ void QgsCompassPlugin::unload()
   mQGisIface->removePluginMenu( sName, mActionAboutCompass );
 
   delete mActionRunCompass;
+  mActionRunCompass = 0;
   delete mActionAboutCompass;
+  mActionAboutCompass = 0;
   delete mDock;
+  mDock = 0;
 }
 
 //! Set icons to the current theme
 void QgsCompassPlugin::setCurrentTheme( QString )
 {
-  mActionRunCompass->setIcon( getThemeIcon( "/mCompassRun.png" ) );
-  mActionAboutCompass->setIcon( getThemeIcon( "/mActionAbout.png" ) );
+  if ( mActionRunCompass && mActionAboutCompass )
+  {
+    mActionRunCompass->setIcon( getThemeIcon( "/mCompassRun.png" ) );
+    mActionAboutCompass->setIcon( getThemeIcon( "/mActionAbout.png" ) );
+  }
 }
 
 QIcon QgsCompassPlugin::getThemeIcon( const QString &theName )