From aff8e4e941f065c9ed221ea393084b13ba5ac4e2 Mon Sep 17 00:00:00 2001
From: Carl Hetherington <carl@carlh.net>
Date: Sun, 14 Nov 2010 11:50:43 +0000
Subject: [PATCH] Fix crash on removing marker.

git-svn-id: svn://localhost/ardour2/branches/3.0@8023 d708f5d6-7413-0410-9779-e7cbd77b26cf
---
 gtk2_ardour/marker.cc | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/gtk2_ardour/marker.cc b/gtk2_ardour/marker.cc
index bf3b7729c0..ca4cfbf4c5 100644
--- a/gtk2_ardour/marker.cc
+++ b/gtk2_ardour/marker.cc
@@ -268,6 +268,7 @@ Marker::Marker (PublicEditor& ed, ArdourCanvas::Group& parent, ArdourCanvas::Gro
 	editor.ZoomChanged.connect (sigc::mem_fun (*this, &Marker::reposition));
 
 	mark->set_data ("marker", this);
+	_name_background->set_data ("marker", this);
 
 	if (handle_events) {
 		group->signal_event().connect (sigc::bind (sigc::mem_fun (editor, &PublicEditor::canvas_marker_event), mark, this));
@@ -281,10 +282,7 @@ Marker::~Marker ()
 	CatchDeletion (this); /* EMIT SIGNAL */
 
 	/* destroying the parent group destroys its contents, namely any polygons etc. that we added */
-	delete name_pixbuf;
-	delete mark;
-	delete points;
-
+	delete group;
 	delete _line;
 }