From d82cdcc20518336f844c59481edbae917be3a815 Mon Sep 17 00:00:00 2001
From: carlh <carlh@d708f5d6-7413-0410-9779-e7cbd77b26cf>
Date: Thu, 5 May 2011 12:45:24 +0000
Subject: [PATCH] Fix marker deletion from 9479 properly.

git-svn-id: http://subversion.ardour.org/svn/ardour2/ardour2/branches/3.0@9481 d708f5d6-7413-0410-9779-e7cbd77b26cf
---
 gtk2_ardour/editor_markers.cc | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/gtk2_ardour/editor_markers.cc b/gtk2_ardour/editor_markers.cc
index 5ba75c647..b060b11a6 100644
--- a/gtk2_ardour/editor_markers.cc
+++ b/gtk2_ardour/editor_markers.cc
@@ -513,9 +513,10 @@ Editor::refresh_location_display_internal (Locations::LocationList& locations)
 			if (i->second->end) {
 				remove_sorted_marker (i->second->end);
 			}
-			
+
+			LocationMarkers* m = i->second;
 			location_markers.erase (i);
-			delete i->second;
+			delete m;
 		}
 
 		i = tmp;
@@ -716,9 +717,10 @@ Editor::location_gone (Location *location)
 			if (i->second->end) {
 				remove_sorted_marker (i->second->end);
 			}
-			
+
+			LocationMarkers* m = i->second;
 			location_markers.erase (i);
-			delete i->second;
+			delete m;
 			break;
 		}
 	}
-- 
2.11.4.GIT