summaryrefslogtreecommitdiff
path: root/libs/ardour/location.cc
diff options
context:
space:
mode:
authorPaul Davis <paul@linuxaudiosystems.com>2006-03-11 16:22:15 +0000
committerPaul Davis <paul@linuxaudiosystems.com>2006-03-11 16:22:15 +0000
commitdcbab98be7edb7f0c2cbbeaaf22443e4a56fce41 (patch)
tree861dd85af3fe57992294f25448941c0315007a9e /libs/ardour/location.cc
parentddfc8d2185ec9cef7afe74091ea544ec286f13a8 (diff)
prevent removal of start marker
git-svn-id: svn://localhost/trunk/ardour2@377 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'libs/ardour/location.cc')
-rw-r--r--libs/ardour/location.cc6
1 files changed, 3 insertions, 3 deletions
diff --git a/libs/ardour/location.cc b/libs/ardour/location.cc
index f4eea2cfc5..87a27e5c3d 100644
--- a/libs/ardour/location.cc
+++ b/libs/ardour/location.cc
@@ -404,7 +404,7 @@ Locations::clear ()
for (LocationList::iterator i = locations.begin(); i != locations.end(); ) {
tmp = i;
++tmp;
- if (!(*i)->is_end()) {
+ if (!(*i)->is_end() && !(*i)->is_start()) {
locations.erase (i);
}
i = tmp;
@@ -431,7 +431,7 @@ Locations::clear_markers ()
tmp = i;
++tmp;
- if ((*i)->is_mark() && !(*i)->is_end()) {
+ if ((*i)->is_mark() && !(*i)->is_end() && !(*i)->is_start()) {
locations.erase (i);
}
@@ -502,7 +502,7 @@ Locations::remove (Location *loc)
bool was_current = false;
LocationList::iterator i;
- if (loc->is_end()) {
+ if (loc->is_end() || loc->is_start()) {
return;
}