workaround for #2853

jef · jef · commit 6b0a6e92d9c4 · 2010-07-01T06:58:03.000Z
git-svn-id: http://svn.osgeo.org/qgis/trunk@13864 c8812cc2-4d05-0410-92ff-de0c093fc19c
diff --git a/src/app/qgsmaptooladdfeature.cpp b/src/app/qgsmaptooladdfeature.cpp
@@ -486,11 +486,6 @@ void QgsMapToolAddFeature::canvasReleaseEvent( QMouseEvent * e )
           vlayer->endEditCommand();
         }
         mypDialog->deleteLater();
-
-#ifdef Q_OS_WIN
-        // hope your wearing your peril sensitive sunglasses.
-        QgisApp::instance()->skipNextContextMenuEvent();
-#endif
       }
       delete f;
 
diff --git a/src/app/qgsmaptoolcapture.cpp b/src/app/qgsmaptoolcapture.cpp
@@ -175,6 +175,11 @@ void QgsMapToolCapture::stopCapturing()
 
   mGeomErrors.clear();
 
+#ifdef Q_OS_WIN
+  // hope your wearing your peril sensitive sunglasses.
+  QgisApp::instance()->skipNextContextMenuEvent();
+#endif
+
   mCapturing = false;
   mCaptureList.clear();
   mCanvas->refresh();

Original file line number	Diff line number	Diff line change
`@@ -486,11 +486,6 @@ void QgsMapToolAddFeature::canvasReleaseEvent( QMouseEvent * e )`
`486`	`486`	`vlayer->endEditCommand();`
`487`	`487`	`}`
`488`	`488`	`mypDialog->deleteLater();`
`489`		`-`
`490`		`-#ifdef Q_OS_WIN`
`491`		`- // hope your wearing your peril sensitive sunglasses.`
`492`		`- QgisApp::instance()->skipNextContextMenuEvent();`
`493`		`-#endif`
`494`	`489`	`}`
`495`	`490`	`delete f;`
`496`	`491`