fix crash when maptool of a plugin is active on exit

qgis · Apr 25, 2014 · b548ac8 · b548ac8
1 parent 7f7118c
commit b548ac8
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 0 deletions.
diff --git a/src/gui/qgsmaptool.cpp b/src/gui/qgsmaptool.cpp
@@ -98,7 +98,16 @@ void QgsMapTool::deactivate()
 
 void QgsMapTool::setAction( QAction* action )
 {
+  if( mAction )
+    disconnect( mAction, SIGNAL( destroyed() ), this, SLOT( actionDestroyed() ) );
   mAction = action;
+  connect( mAction, SIGNAL( destroyed() ), this, SLOT( actionDestroyed() ) );
+}
+
+void QgsMapTool::actionDestroyed()
+{
+  if( mAction == sender() )
+    mAction = 0;
 }
 
 QAction* QgsMapTool::action()

diff --git a/src/gui/qgsmaptool.h b/src/gui/qgsmaptool.h
@@ -153,6 +153,10 @@ class GUI_EXPORT QgsMapTool : public QObject
     //! emit signal to clear previous message
     void messageDiscarded();
 
+  private slots:
+    //! clear pointer when action is destroyed
+    void actionDestroyed();
+
   protected:
 
     //! constructor takes map canvas as a parameter