Don't try to connect to null action (removes a warning)

m-kuhn · m-kuhn · commit d68422d14014 · 2015-03-17T21:14:01.000+01:00
diff --git a/src/gui/qgsmaptool.cpp b/src/gui/qgsmaptool.cpp
@@ -105,7 +105,8 @@ void QgsMapTool::setAction( QAction* action )
   if ( mAction )
     disconnect( mAction, SIGNAL( destroyed() ), this, SLOT( actionDestroyed() ) );
   mAction = action;
-  connect( mAction, SIGNAL( destroyed() ), this, SLOT( actionDestroyed() ) );
+  if ( mAction )
+    connect( mAction, SIGNAL( destroyed() ), this, SLOT( actionDestroyed() ) );
 }
 
 void QgsMapTool::actionDestroyed()

Original file line number	Diff line number	Diff line change
`@@ -105,7 +105,8 @@ void QgsMapTool::setAction( QAction* action )`
`105`	`105`	`if ( mAction )`
`106`	`106`	`disconnect( mAction, SIGNAL( destroyed() ), this, SLOT( actionDestroyed() ) );`
`107`	`107`	`mAction = action;`
`108`		`- connect( mAction, SIGNAL( destroyed() ), this, SLOT( actionDestroyed() ) );`
	`108`	`+ if ( mAction )`
	`109`	`+ connect( mAction, SIGNAL( destroyed() ), this, SLOT( actionDestroyed() ) );`
`109`	`110`	`}`
`110`	`111`
`111`	`112`	`void QgsMapTool::actionDestroyed()`