From: Soeren Apel <redacted>
Date: Thu, 24 Nov 2016 17:42:24 +0000 (+0100)
Subject: Fix #849 by making sure no references to the DecodeTrace instance remain
X-Git-Tag: pulseview-0.4.0~222
X-Git-Url: https://sigrok.org/gitweb/?p=pulseview.git;a=commitdiff_plain;h=2d25fc473d6dc5d578f45f8d6bb061639afec405

Fix #849 by making sure no references to the DecodeTrace instance remain
---

diff --git a/pv/session.cpp b/pv/session.cpp
index 3c5bcc42..2d7918b8 100644
--- a/pv/session.cpp
+++ b/pv/session.cpp
@@ -585,8 +585,12 @@ bool Session::add_decoder(srd_decoder *const dec)
 
 void Session::remove_decode_signal(shared_ptr<data::SignalBase> signalbase)
 {
+	signalbases_.erase(signalbase);
+
 	for (std::shared_ptr<views::ViewBase> view : views_)
 		view->remove_decode_signal(signalbase);
+
+	signals_changed();
 }
 #endif
 
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);