X-Git-Url: https://sigrok.org/gitweb/?p=pulseview.git;a=blobdiff_plain;f=pv%2Fview%2Fviewwidget.cpp;fp=pv%2Fview%2Fviewwidget.cpp;h=8a7a728521ff49fb8f28b19d7412d126c8d90a58;hp=3bd8c6b9d919522909a3578fe69240767f2e7788;hb=2d25fc473d6dc5d578f45f8d6bb061639afec405;hpb=3cb15390cef38a29e3befd517b6fd20ca228c2bc

diff --git a/pv/view/viewwidget.cpp b/pv/view/viewwidget.cpp
index 3bd8c6b9..8a7a7285 100644
--- a/pv/view/viewwidget.cpp
+++ b/pv/view/viewwidget.cpp
@@ -252,16 +252,23 @@ void ViewWidget::mousePressEvent(QMouseEvent *event)
 {
 	assert(event);
 
-	mouse_down_point_ = event->pos();
-	mouse_down_item_ = get_mouse_over_item(event->pos());
-
-	if (event->button() & Qt::LeftButton)
+	/* Ignore right click events as they will open context menus when
+	 * used on trace labels. Those menus prevent ViewWidget::mouseReleaseEvent()
+	 * to be triggered upon button release, making mouse_down_item_
+	 * hold the last reference to a view item that might have been deleted
+	 * from the context menu, preventing it from being freed as intended.
+	 */
+	if (event->button() & Qt::LeftButton) {
+		mouse_down_point_ = event->pos();
+		mouse_down_item_ = get_mouse_over_item(event->pos());
 		mouse_left_press_event(event);
+	}
 }
 
 void ViewWidget::mouseReleaseEvent(QMouseEvent *event)
 {
 	assert(event);
+
 	if (event->button() & Qt::LeftButton)
 		mouse_left_release_event(event);