diff options
author | Paul Davis <paul@linuxaudiosystems.com> | 2013-01-02 23:54:06 +0000 |
---|---|---|
committer | Paul Davis <paul@linuxaudiosystems.com> | 2013-01-02 23:54:06 +0000 |
commit | 67265c6d90b2a84300e99ac629f9516b4d43f07f (patch) | |
tree | 9883a6bbce4d4a422be93793169e82255458fd5c /gtk2_ardour/selection.cc | |
parent | bcab77225765a35217505ce668404ae8a8feb999 (diff) |
various fixes for moving markers, fixes a crash reported by tim blechmann and also likely #5232 and #5241
git-svn-id: svn://localhost/ardour2/branches/3.0@13754 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'gtk2_ardour/selection.cc')
-rw-r--r-- | gtk2_ardour/selection.cc | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/gtk2_ardour/selection.cc b/gtk2_ardour/selection.cc index f6643d3829..146d9a65c5 100644 --- a/gtk2_ardour/selection.cc +++ b/gtk2_ardour/selection.cc @@ -1129,7 +1129,7 @@ void Selection::set (Marker* m) { clear_time (); //enforce region/object exclusivity - clear_objects(); + markers.clear (); add (m); } @@ -1137,8 +1137,6 @@ Selection::set (Marker* m) void Selection::toggle (Marker* m) { - clear_time (); //enforce region/object exclusivity - MarkerSelection::iterator i; if ((i = find (markers.begin(), markers.end(), m)) == markers.end()) { |