fix crash in Georeferencer plugin

slarosa · timlinux · commit ca1301ba83ec · 2013-09-06T23:52:52.000+02:00
diff --git a/src/plugins/georeferencer/qgsgeorefplugin.cpp b/src/plugins/georeferencer/qgsgeorefplugin.cpp
@@ -125,6 +125,7 @@ void QgsGeorefPlugin::unload()
   mQGisIface->removeRasterToolBarIcon( mActionRunGeoref );
 
   delete mActionRunGeoref;
+  mActionRunGeoref = 0;
 
   delete mPluginGui;
   mPluginGui = NULL;
@@ -133,7 +134,8 @@ void QgsGeorefPlugin::unload()
 //! Set icons to the current theme
 void QgsGeorefPlugin::setCurrentTheme( QString )
 {
-  mActionRunGeoref->setIcon( getThemeIcon( "/mGeorefRun.png" ) );
+  if ( mActionRunGeoref )
+    mActionRunGeoref->setIcon( getThemeIcon( "/mGeorefRun.png" ) );
 }
 
 QIcon QgsGeorefPlugin::getThemeIcon( const QString &theName )

Original file line number	Diff line number	Diff line change
`@@ -125,6 +125,7 @@ void QgsGeorefPlugin::unload()`
`125`	`125`	`mQGisIface->removeRasterToolBarIcon( mActionRunGeoref );`
`126`	`126`
`127`	`127`	`delete mActionRunGeoref;`
	`128`	`+ mActionRunGeoref = 0;`
`128`	`129`
`129`	`130`	`delete mPluginGui;`
`130`	`131`	`mPluginGui = NULL;`
`@@ -133,7 +134,8 @@ void QgsGeorefPlugin::unload()`
`133`	`134`	`//! Set icons to the current theme`
`134`	`135`	`void QgsGeorefPlugin::setCurrentTheme( QString )`
`135`	`136`	`{`
`136`		`- mActionRunGeoref->setIcon( getThemeIcon( "/mGeorefRun.png" ) );`
	`137`	`+ if ( mActionRunGeoref )`
	`138`	`+ mActionRunGeoref->setIcon( getThemeIcon( "/mGeorefRun.png" ) );`
`137`	`139`	`}`
`138`	`140`
`139`	`141`	`QIcon QgsGeorefPlugin::getThemeIcon( const QString &theName )`