summaryrefslogtreecommitdiff
path: root/gtk2_ardour/editor_markers.cc
diff options
context:
space:
mode:
authorCarl Hetherington <carl@carlh.net>2011-05-05 12:45:24 +0000
committerCarl Hetherington <carl@carlh.net>2011-05-05 12:45:24 +0000
commite0926ce2c662b59d75e13a51a13b9483bee3a683 (patch)
tree623f54c4b5e101fdcf1539c0bab6208c55967300 /gtk2_ardour/editor_markers.cc
parentae91577f2c34119d07be11cc03d99483eeb5d4e6 (diff)
Fix marker deletion from 9479 properly.
git-svn-id: svn://localhost/ardour2/branches/3.0@9481 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'gtk2_ardour/editor_markers.cc')
-rw-r--r--gtk2_ardour/editor_markers.cc10
1 files changed, 6 insertions, 4 deletions
diff --git a/gtk2_ardour/editor_markers.cc b/gtk2_ardour/editor_markers.cc
index 5ba75c647e..b060b11a63 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;
}
}