Skip to content

Commit d8c9592

Browse files
committed
[composer] Fix qt disconnect warnings
1 parent 5adbaf7 commit d8c9592

File tree

1 file changed

+10
-2
lines changed

1 file changed

+10
-2
lines changed

src/core/composer/qgscomposerscalebar.cpp

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -136,8 +136,11 @@ void QgsComposerScaleBar::setBoxContentSpace( double space )
136136

137137
void QgsComposerScaleBar::setComposerMap( const QgsComposerMap* map )
138138
{
139-
disconnect( mComposerMap, SIGNAL( extentChanged() ), this, SLOT( updateSegmentSize() ) );
140-
disconnect( mComposerMap, SIGNAL( destroyed( QObject* ) ), this, SLOT( invalidateCurrentMap() ) );
139+
if ( mComposerMap )
140+
{
141+
disconnect( mComposerMap, SIGNAL( extentChanged() ), this, SLOT( updateSegmentSize() ) );
142+
disconnect( mComposerMap, SIGNAL( destroyed( QObject* ) ), this, SLOT( invalidateCurrentMap() ) );
143+
}
141144
mComposerMap = map;
142145

143146
if ( !map )
@@ -154,6 +157,11 @@ void QgsComposerScaleBar::setComposerMap( const QgsComposerMap* map )
154157

155158
void QgsComposerScaleBar::invalidateCurrentMap()
156159
{
160+
if ( !mComposerMap )
161+
{
162+
return;
163+
}
164+
157165
disconnect( mComposerMap, SIGNAL( extentChanged() ), this, SLOT( updateSegmentSize() ) );
158166
disconnect( mComposerMap, SIGNAL( destroyed( QObject* ) ), this, SLOT( invalidateCurrentMap() ) );
159167
mComposerMap = 0;

0 commit comments

Comments
 (0)