Mercurial > hg > svgui

changeset 801:8be221f18313 tonioni

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge
author Chris Cannam
date Mon, 16 Jun 2014 11:49:05 +0100
parents 102ffad481e6 (current diff) d6b79166ae0d (diff)
children 584b11df8e4f
files
diffstat 1 files changed, 2 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/layer/FlexiNoteLayer.cpp	Mon Jun 16 11:40:02 2014 +0100
+++ b/layer/FlexiNoteLayer.cpp	Mon Jun 16 11:49:05 2014 +0100
@@ -1667,8 +1667,8 @@
     for (FlexiNoteModel::PointList::iterator i = points.begin();
          i != points.end(); ++i) {
         bool overlap = !(
-            ((s.getStartFrame() < i->frame) && (s.getEndFrame() < i->frame)) || // selection is left of note
-            ((s.getStartFrame() > (i->frame+i->duration-1)) && (s.getEndFrame() > (i->frame+i->duration-1))) // selection is right of note
+            ((s.getStartFrame() <= i->frame) && (s.getEndFrame() <= i->frame)) || // selection is left of note
+            ((s.getStartFrame() >= (i->frame+i->duration)) && (s.getEndFrame() >= (i->frame+i->duration))) // selection is right of note
             );
         if (overlap) {
             command->deletePoint(*i);