# HG changeset patch
# User Chris Cannam
# Date 1402915745 -3600
# Node ID 8be221f1831388b523b88a74fb2e3d30d2d23291
# Parent  102ffad481e6cf8d8cdf6dc42f09bc9593ec4c6d# Parent  d6b79166ae0d6dcf0ed55aba08f50fdfcd229647
Merge

diff -r 102ffad481e6 -r 8be221f18313 layer/FlexiNoteLayer.cpp
--- 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);