summaryrefslogtreecommitdiff
path: root/gtk2_ardour/editor_markers.cc
diff options
context:
space:
mode:
authorCarl Hetherington <carl@carlh.net>2011-05-05 12:08:12 +0000
committerCarl Hetherington <carl@carlh.net>2011-05-05 12:08:12 +0000
commit35eecc59162846d39e52aa80c284e6ffecfea926 (patch)
tree7cda4eaf46dafd1c6e446e0ad5d26d1e4f1b40fd /gtk2_ardour/editor_markers.cc
parent0ae6682bf867e46b28a523f3c9090a426895ef09 (diff)
Remove LocationMarker from the editor's lists before deleting it, as the deletion causes the contents of the editor's list to be deselected. May be related to #3929.
git-svn-id: svn://localhost/ardour2/branches/3.0@9479 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'gtk2_ardour/editor_markers.cc')
-rw-r--r--gtk2_ardour/editor_markers.cc5
1 files changed, 2 insertions, 3 deletions
diff --git a/gtk2_ardour/editor_markers.cc b/gtk2_ardour/editor_markers.cc
index 34fdc094b1..5ba75c647e 100644
--- a/gtk2_ardour/editor_markers.cc
+++ b/gtk2_ardour/editor_markers.cc
@@ -514,8 +514,8 @@ Editor::refresh_location_display_internal (Locations::LocationList& locations)
remove_sorted_marker (i->second->end);
}
- delete i->second;
location_markers.erase (i);
+ delete i->second;
}
i = tmp;
@@ -717,9 +717,8 @@ Editor::location_gone (Location *location)
remove_sorted_marker (i->second->end);
}
-
- delete i->second;
location_markers.erase (i);
+ delete i->second;
break;
}
}