Skip to content

Commit bde5126

Browse files
committed
globe plugin: fix crash on exit
1 parent 3bfe2f1 commit bde5126

File tree

1 file changed

+16
-1
lines changed

1 file changed

+16
-1
lines changed

src/plugins/globe/globe_plugin.cpp

Lines changed: 16 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -826,7 +826,7 @@ void GlobePlugin::setupProxy()
826826

827827
void GlobePlugin::extentsChanged()
828828
{
829-
QgsDebugMsg( "extentsChanged: " + mQGisIface->mapCanvas()->extent().toString() );
829+
QgsDebugMsg( "extentsChanged: " + qobject_cast<QgsMapCanvas *>( sender() )->extent().toString() );
830830
}
831831

832832
void GlobePlugin::imageLayersChanged()
@@ -1014,6 +1014,21 @@ void GlobePlugin::unload()
10141014
mQGisIface->removeToolBarIcon( mQActionPointer );
10151015

10161016
delete mQActionPointer;
1017+
delete mQActionSettingsPointer;
1018+
delete mQActionUnload;
1019+
1020+
disconnect( mQGisIface->mapCanvas(), SIGNAL( extentsChanged() ),
1021+
this, SLOT( extentsChanged() ) );
1022+
disconnect( mQGisIface->mapCanvas(), SIGNAL( layersChanged() ),
1023+
this, SLOT( imageLayersChanged() ) );
1024+
disconnect( mSettingsDialog, SIGNAL( elevationDatasourcesChanged() ),
1025+
this, SLOT( elevationLayersChanged() ) );
1026+
disconnect( mQGisIface->mainWindow(), SIGNAL( projectRead() ), this,
1027+
SLOT( projectReady() ) );
1028+
disconnect( mQGisIface, SIGNAL( newProjectCreated() ), this,
1029+
SLOT( blankProjectReady() ) );
1030+
disconnect( this, SIGNAL( xyCoordinates( const QgsPoint & ) ),
1031+
mQGisIface->mapCanvas(), SIGNAL( xyCoordinates( const QgsPoint & ) ) );
10171032

10181033
#if 0
10191034
if ( mCoutRdBuf )

0 commit comments

Comments
 (0)