Cancel simplification if its dialog is closed (fixes #15163)

qgis · Jun 29, 2016 · 48284f7 · 48284f7
1 parent 51c6d8a
commit 48284f7
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 0 deletions.
diff --git a/src/app/qgsmaptoolsimplify.cpp b/src/app/qgsmaptoolsimplify.cpp
@@ -52,6 +52,12 @@ void QgsSimplifyDialog::enableOkButton( bool enabled )
   okButton->setEnabled( enabled );
 }
 
+void QgsSimplifyDialog::closeEvent( QCloseEvent* e )
+{
+  QDialog::closeEvent( e );
+  mTool->clearSelection();
+}
+
 
 ////////////////////////////////////////////////////////////////////////////
 

diff --git a/src/app/qgsmaptoolsimplify.h b/src/app/qgsmaptoolsimplify.h
@@ -38,6 +38,11 @@ class APP_EXPORT QgsSimplifyDialog : public QDialog, private Ui::SimplifyLineDia
     void updateStatusText();
     void enableOkButton( bool enabled );
 
+  protected:
+
+    //! Also cancels pending simplification
+    virtual void closeEvent( QCloseEvent* e ) override;
+
   private:
     QgsMapToolSimplify* mTool;