fix #3859

qgis · Jun 1, 2011 · 445ef93 · 445ef93
1 parent 2516c38
commit 445ef93
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 5 deletions.
diff --git a/src/plugins/grass/qgsgrassedit.cpp b/src/plugins/grass/qgsgrassedit.cpp
@@ -1780,9 +1780,8 @@ void QgsGrassEdit::displayDynamic( struct line_pnts *Points, double x, double y,
 
 void QgsGrassEdit::displayNode( int node, const QPen & pen, int size, QPainter *painter )
 {
-  QgsDebugMsg( QString( "node = %1" ).arg( node ) );
-
-  if ( !mSymbDisplay[mNodeSymb[node]] ) return;
+  if ( !mSymbDisplay[mNodeSymb[node]] )
+    return;
 
   double x, y;
 
@@ -1805,8 +1804,6 @@ QgsPoint QgsGrassEdit::transformLayerToMap( QgsPoint point )
 void QgsGrassEdit::displayIcon( double x, double y, const QPen & pen,
                                 int type, int size, QPainter *painter )
 {
-  QgsDebugMsg( "entered." );
-
   QgsPoint point;
   QPolygon pointArray( 2 );
 

diff --git a/src/plugins/grass/qgsgrassplugin.cpp b/src/plugins/grass/qgsgrassplugin.cpp
@@ -452,6 +452,7 @@ void QgsGrassPlugin::edit()
     mCanvas->refresh();
     connect( mEdit, SIGNAL( finished() ), this, SLOT( setEditAction() ) );
     connect( mEdit, SIGNAL( finished() ), this, SLOT( cleanUp() ) );
+    connect( mEdit, SIGNAL( destroyed() ), this, SLOT( editClosed() ) );
     connect( QgsMapLayerRegistry::instance(), SIGNAL( layerWillBeRemoved( QString ) ), this, SLOT( closeEdit( QString ) ) );
   }
   else
@@ -486,6 +487,12 @@ void QgsGrassPlugin::closeEdit( QString layerId )
   }
 }
 
+void QgsGrassPlugin::editClosed()
+{
+  if( mEdit == sender() )
+    mEdit = 0;
+}
+
 void QgsGrassPlugin::cleanUp()
 {
   disconnect( QgsMapLayerRegistry::instance(), SIGNAL( layerWillBeRemoved( QString ) ), this, SLOT( closeEdit( QString ) ) );

diff --git a/src/plugins/grass/qgsgrassplugin.h b/src/plugins/grass/qgsgrassplugin.h
@@ -129,6 +129,7 @@ class QgsGrassPlugin: public QObject, public QgisPlugin
     //! update plugin icons when the app tells us its theme is changed
     void setCurrentTheme( QString theThemeName );
     void setTransform();
+    void editClosed();
   private:
     //! Name of the plugin
     QString pluginNameQString;